summaryrefslogtreecommitdiff
path: root/arch/powerpc/include/asm/pci-bridge.h
diff options
context:
space:
mode:
authorRob Herring <rob.herring@calxeda.com>2011-07-12 09:25:51 -0500
committerRob Herring <rob.herring@calxeda.com>2011-07-12 09:28:04 -0500
commit0e47ff1ce65bbd0b12a9421a2756b26987ea5083 (patch)
treeaa15e9928332fbba8caf93a17d7aaecce4a10209 /arch/powerpc/include/asm/pci-bridge.h
parentfe0d42203cb5616eeff68b14576a0f7e2dd56625 (diff)
powerpc: rename ppc_pci_*_flags to pci_*_flags
This renames pci flags functions and enums in preparation for creating generic version in asm-generic/pci-bridge.h. The following search and replace is done: s/ppc_pci_/pci_/ s/PPC_PCI_/PCI_/ Direct accesses to ppc_pci_flag variable are replaced with helper functions. Signed-off-by: Rob Herring <rob.herring@calxeda.com> Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/include/asm/pci-bridge.h')
-rw-r--r--arch/powerpc/include/asm/pci-bridge.h32
1 files changed, 16 insertions, 16 deletions
diff --git a/arch/powerpc/include/asm/pci-bridge.h b/arch/powerpc/include/asm/pci-bridge.h
index b90dbf8e5cd9..b3a40c3d5000 100644
--- a/arch/powerpc/include/asm/pci-bridge.h
+++ b/arch/powerpc/include/asm/pci-bridge.h
@@ -17,45 +17,45 @@ enum {
/* Force re-assigning all resources (ignore firmware
* setup completely)
*/
- PPC_PCI_REASSIGN_ALL_RSRC = 0x00000001,
+ PCI_REASSIGN_ALL_RSRC = 0x00000001,
/* Re-assign all bus numbers */
- PPC_PCI_REASSIGN_ALL_BUS = 0x00000002,
+ PCI_REASSIGN_ALL_BUS = 0x00000002,
/* Do not try to assign, just use existing setup */
- PPC_PCI_PROBE_ONLY = 0x00000004,
+ PCI_PROBE_ONLY = 0x00000004,
/* Don't bother with ISA alignment unless the bridge has
* ISA forwarding enabled
*/
- PPC_PCI_CAN_SKIP_ISA_ALIGN = 0x00000008,
+ PCI_CAN_SKIP_ISA_ALIGN = 0x00000008,
/* Enable domain numbers in /proc */
- PPC_PCI_ENABLE_PROC_DOMAINS = 0x00000010,
+ PCI_ENABLE_PROC_DOMAINS = 0x00000010,
/* ... except for domain 0 */
- PPC_PCI_COMPAT_DOMAIN_0 = 0x00000020,
+ PCI_COMPAT_DOMAIN_0 = 0x00000020,
};
#ifdef CONFIG_PCI
-extern unsigned int ppc_pci_flags;
+extern unsigned int pci_flags;
-static inline void ppc_pci_set_flags(int flags)
+static inline void pci_set_flags(int flags)
{
- ppc_pci_flags = flags;
+ pci_flags = flags;
}
-static inline void ppc_pci_add_flags(int flags)
+static inline void pci_add_flags(int flags)
{
- ppc_pci_flags |= flags;
+ pci_flags |= flags;
}
-static inline int ppc_pci_has_flag(int flag)
+static inline int pci_has_flag(int flag)
{
- return (ppc_pci_flags & flag);
+ return (pci_flags & flag);
}
#else
-static inline void ppc_pci_set_flags(int flags) { }
-static inline void ppc_pci_add_flags(int flags) { }
-static inline int ppc_pci_has_flag(int flag)
+static inline void pci_set_flags(int flags) { }
+static inline void pci_add_flags(int flags) { }
+static inline int pci_has_flag(int flag)
{
return 0;
}