diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-27 15:48:33 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-11-05 06:11:53 -0500 |
commit | ab56ced9c57b66862c687f3158045d15133f02d6 (patch) | |
tree | 4722dbc469452625e28c2dd65734746e137a0cfc /arch/powerpc/kernel | |
parent | 53280323350621985b3f2f8ffe649215304bcc5f (diff) |
powerpc/pci: Remove pcibios_do_bus_setup()
The function pcibios_do_bus_setup() was used by pcibios_fixup_bus()
to perform setup that is different between the 32-bit and 64-bit
code. This difference no longer exists, thus the function is removed
and the setup now done directly from pci-common.c.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kernel')
-rw-r--r-- | arch/powerpc/kernel/pci-common.c | 16 | ||||
-rw-r--r-- | arch/powerpc/kernel/pci_32.c | 11 | ||||
-rw-r--r-- | arch/powerpc/kernel/pci_64.c | 11 |
3 files changed, 11 insertions, 27 deletions
diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c index 6d46bfabdbe4..780db386c1f0 100644 --- a/arch/powerpc/kernel/pci-common.c +++ b/arch/powerpc/kernel/pci-common.c | |||
@@ -1076,18 +1076,24 @@ static void __devinit pcibios_fixup_bridge(struct pci_bus *bus) | |||
1076 | 1076 | ||
1077 | static void __devinit __pcibios_fixup_bus(struct pci_bus *bus) | 1077 | static void __devinit __pcibios_fixup_bus(struct pci_bus *bus) |
1078 | { | 1078 | { |
1079 | struct pci_dev *dev = bus->self; | 1079 | struct pci_dev *dev; |
1080 | 1080 | ||
1081 | pr_debug("PCI: Fixup bus %d (%s)\n", bus->number, dev ? pci_name(dev) : "PHB"); | 1081 | pr_debug("PCI: Fixup bus %d (%s)\n", |
1082 | bus->number, bus->self ? pci_name(bus->self) : "PHB"); | ||
1082 | 1083 | ||
1083 | /* Fixup PCI<->PCI bridges. Host bridges are handled separately, for | 1084 | /* Fixup PCI<->PCI bridges. Host bridges are handled separately, for |
1084 | * now differently between 32 and 64 bits. | 1085 | * now differently between 32 and 64 bits. |
1085 | */ | 1086 | */ |
1086 | if (dev != NULL) | 1087 | if (bus->self != NULL) |
1087 | pcibios_fixup_bridge(bus); | 1088 | pcibios_fixup_bridge(bus); |
1088 | 1089 | ||
1089 | /* Additional setup that is different between 32 and 64 bits for now */ | 1090 | /* Setup bus DMA mappings */ |
1090 | pcibios_do_bus_setup(bus); | 1091 | if (ppc_md.pci_dma_bus_setup) |
1092 | ppc_md.pci_dma_bus_setup(bus); | ||
1093 | |||
1094 | /* Setup DMA for all PCI devices on that bus */ | ||
1095 | list_for_each_entry(dev, &bus->devices, bus_list) | ||
1096 | pcibios_setup_new_device(dev); | ||
1091 | 1097 | ||
1092 | /* Platform specific bus fixups */ | 1098 | /* Platform specific bus fixups */ |
1093 | if (ppc_md.pcibios_fixup_bus) | 1099 | if (ppc_md.pcibios_fixup_bus) |
diff --git a/arch/powerpc/kernel/pci_32.c b/arch/powerpc/kernel/pci_32.c index 883040358273..7ad11e592f2b 100644 --- a/arch/powerpc/kernel/pci_32.c +++ b/arch/powerpc/kernel/pci_32.c | |||
@@ -446,17 +446,6 @@ static int __init pcibios_init(void) | |||
446 | 446 | ||
447 | subsys_initcall(pcibios_init); | 447 | subsys_initcall(pcibios_init); |
448 | 448 | ||
449 | void __devinit pcibios_do_bus_setup(struct pci_bus *bus) | ||
450 | { | ||
451 | struct pci_dev *dev; | ||
452 | |||
453 | if (ppc_md.pci_dma_bus_setup) | ||
454 | ppc_md.pci_dma_bus_setup(bus); | ||
455 | |||
456 | list_for_each_entry(dev, &bus->devices, bus_list) | ||
457 | pcibios_setup_new_device(dev); | ||
458 | } | ||
459 | |||
460 | /* the next one is stolen from the alpha port... */ | 449 | /* the next one is stolen from the alpha port... */ |
461 | void __init | 450 | void __init |
462 | pcibios_update_irq(struct pci_dev *dev, int irq) | 451 | pcibios_update_irq(struct pci_dev *dev, int irq) |
diff --git a/arch/powerpc/kernel/pci_64.c b/arch/powerpc/kernel/pci_64.c index f5fc547284bc..e6e8813c364a 100644 --- a/arch/powerpc/kernel/pci_64.c +++ b/arch/powerpc/kernel/pci_64.c | |||
@@ -507,17 +507,6 @@ int __devinit pcibios_map_io_space(struct pci_bus *bus) | |||
507 | } | 507 | } |
508 | EXPORT_SYMBOL_GPL(pcibios_map_io_space); | 508 | EXPORT_SYMBOL_GPL(pcibios_map_io_space); |
509 | 509 | ||
510 | void __devinit pcibios_do_bus_setup(struct pci_bus *bus) | ||
511 | { | ||
512 | struct pci_dev *dev; | ||
513 | |||
514 | if (ppc_md.pci_dma_bus_setup) | ||
515 | ppc_md.pci_dma_bus_setup(bus); | ||
516 | |||
517 | list_for_each_entry(dev, &bus->devices, bus_list) | ||
518 | pcibios_setup_new_device(dev); | ||
519 | } | ||
520 | |||
521 | unsigned long pci_address_to_pio(phys_addr_t address) | 510 | unsigned long pci_address_to_pio(phys_addr_t address) |
522 | { | 511 | { |
523 | struct pci_controller *hose, *tmp; | 512 | struct pci_controller *hose, *tmp; |