[PATCH] Introduce ppc_pci_flags accessors
Josh Boyer
jwboyer at linux.vnet.ibm.com
Thu Dec 11 10:54:46 EST 2008
On Thu, 11 Dec 2008 10:46:28 +1100
Michael Ellerman <michael at ellerman.id.au> wrote:
> On Wed, 2008-12-10 at 14:11 -0500, Josh Boyer wrote:
> > Currently there are a number of platforms that open code access to
> > the ppc_pci_flags global variable. However, that variable is not
> > present if CONFIG_PCI is not set, which can lead to a build break.
> >
> > This introduces a number of accessor functions that are defined
> > to be empty in the case of CONFIG_PCI being disabled. The
> > various platform files in the kernel are updated to use these.
> >
> > Signed-off-by: Josh Boyer <jwboyer at linux.vnet.ibm.com>
> >
> > ---
> >
> > diff --git a/arch/powerpc/include/asm/pci-bridge.h b/arch/powerpc/include/asm/pci-bridge.h
> > index fa8b3b7..8f2c7ca 100644
> > --- a/arch/powerpc/include/asm/pci-bridge.h
> > +++ b/arch/powerpc/include/asm/pci-bridge.h
> > @@ -13,7 +13,6 @@
> >
> > struct device_node;
> >
> > -extern unsigned int ppc_pci_flags;
> > enum {
> > /* Force re-assigning all resources (ignore firmware
> > * setup completely)
> > @@ -36,6 +35,16 @@ enum {
> > /* ... except for domain 0 */
> > PPC_PCI_COMPAT_DOMAIN_0 = 0x00000020,
> > };
> > +#ifdef CONFIG_PCI
> > +extern unsigned int ppc_pci_flags;
> > +#define ppc_pci_set_flags(flags) ppc_pci_flags = (flags)
> > +#define ppc_pci_add_flags(flags) ppc_pci_flags |= (flags)
> > +#define ppc_pci_flag_is_set(flag) (ppc_pci_flags & (flag))
> > +#else
> > +#define ppc_pci_set_flags(flags) do {} while (0)
> > +#define ppc_pci_add_flags(flags) do {} while (0)
> > +#define ppc_pci_flag_is_set(flag) (0)
> > +#endif
>
> I hate to be picky, but I don't see any reason why these shouldn't be
> static inlines.
There's a perfectly good reason. I AM LAZY.
That aside, it doesn't matter to me either way. If the general idea
seems fine and the naming of the functions is acceptable, I'd be happy
to respin.
josh
More information about the Linuxppc-dev
mailing list