aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/platforms/powermac/pci.c
diff options
context:
space:
mode:
authorRob Herring <rob.herring@calxeda.com>2011-07-12 10:25:51 -0400
committerRob Herring <rob.herring@calxeda.com>2011-07-12 10:28:04 -0400
commit0e47ff1ce65bbd0b12a9421a2756b26987ea5083 (patch)
treeaa15e9928332fbba8caf93a17d7aaecce4a10209 /arch/powerpc/platforms/powermac/pci.c
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/platforms/powermac/pci.c')
-rw-r--r--arch/powerpc/platforms/powermac/pci.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/platforms/powermac/pci.c b/arch/powerpc/platforms/powermac/pci.c
index f33e08d573ce..c291afd6b616 100644
--- a/arch/powerpc/platforms/powermac/pci.c
+++ b/arch/powerpc/platforms/powermac/pci.c
@@ -731,7 +731,7 @@ static void __init setup_bandit(struct pci_controller *hose,
731static int __init setup_uninorth(struct pci_controller *hose, 731static int __init setup_uninorth(struct pci_controller *hose,
732 struct resource *addr) 732 struct resource *addr)
733{ 733{
734 ppc_pci_add_flags(PPC_PCI_REASSIGN_ALL_BUS); 734 pci_add_flags(PCI_REASSIGN_ALL_BUS);
735 has_uninorth = 1; 735 has_uninorth = 1;
736 hose->ops = &macrisc_pci_ops; 736 hose->ops = &macrisc_pci_ops;
737 hose->cfg_addr = ioremap(addr->start + 0x800000, 0x1000); 737 hose->cfg_addr = ioremap(addr->start + 0x800000, 0x1000);
@@ -998,7 +998,7 @@ void __init pmac_pci_init(void)
998 struct device_node *np, *root; 998 struct device_node *np, *root;
999 struct device_node *ht = NULL; 999 struct device_node *ht = NULL;
1000 1000
1001 ppc_pci_set_flags(PPC_PCI_CAN_SKIP_ISA_ALIGN); 1001 pci_set_flags(PCI_CAN_SKIP_ISA_ALIGN);
1002 1002
1003 root = of_find_node_by_path("/"); 1003 root = of_find_node_by_path("/");
1004 if (root == NULL) { 1004 if (root == NULL) {
@@ -1057,7 +1057,7 @@ void __init pmac_pci_init(void)
1057 * some offset between bus number and domains for now when we 1057 * some offset between bus number and domains for now when we
1058 * assign all busses should help for now 1058 * assign all busses should help for now
1059 */ 1059 */
1060 if (ppc_pci_has_flag(PPC_PCI_REASSIGN_ALL_BUS)) 1060 if (pci_has_flag(PCI_REASSIGN_ALL_BUS))
1061 pcibios_assign_bus_offset = 0x10; 1061 pcibios_assign_bus_offset = 0x10;
1062#endif 1062#endif
1063} 1063}