[PATCH] Introduce ppc_pci_flags accessors

[Michael Ellerman]

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.

cheers

-- 
Michael Ellerman
OzLabs, IBM Australia Development Lab

wwweb: http://michael.ellerman.id.au
phone: +61 2 6212 1183 (tie line 70 21183)

We do not inherit the earth from our ancestors,
we borrow it from our children. - S.M.A.R.T Person
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: This is a digitally signed message part
URL: <http://lists.ozlabs.org/pipermail/linuxppc-dev/attachments/20081211/490affaf/attachment.pgp>