Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ab56ced9 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt Committed by Paul Mackerras
Browse files

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: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 53280323

arch/powerpc/include/asm/pci.h

+0 −1
Original line number Diff line number Diff line
@@ -235,7 +235,6 @@ extern void pci_resource_to_user(const struct pci_dev *dev, int bar, 
				 const struct resource *rsrc,

				 resource_size_t *start, resource_size_t *end);



extern void pcibios_do_bus_setup(struct pci_bus *bus);

extern void pcibios_fixup_of_probed_bus(struct pci_bus *bus);

arch/powerpc/kernel/pci-common.c

+11 −5
Original line number Diff line number Diff line
@@ -1076,18 +1076,24 @@ static void __devinit pcibios_fixup_bridge(struct pci_bus *bus) 


static void __devinit __pcibios_fixup_bus(struct pci_bus *bus)

{

	struct pci_dev *dev = bus->self;

	struct pci_dev *dev;



	pr_debug("PCI: Fixup bus %d (%s)\n", bus->number, dev ? pci_name(dev) : "PHB");

	pr_debug("PCI: Fixup bus %d (%s)\n",

		 bus->number, bus->self ? pci_name(bus->self) : "PHB");



	/* Fixup PCI<->PCI bridges. Host bridges are handled separately, for

	 * now differently between 32 and 64 bits.

	 */

	if (dev != NULL)

	if (bus->self != NULL)

		pcibios_fixup_bridge(bus);



	/* Additional setup that is different between 32 and 64 bits for now */

	pcibios_do_bus_setup(bus);

	/* Setup bus DMA mappings */

	if (ppc_md.pci_dma_bus_setup)

		ppc_md.pci_dma_bus_setup(bus);



	/* Setup DMA for all PCI devices on that bus */

	list_for_each_entry(dev, &bus->devices, bus_list)

		pcibios_setup_new_device(dev);



	/* Platform specific bus fixups */

	if (ppc_md.pcibios_fixup_bus)

arch/powerpc/kernel/pci_32.c

+0 −11
Original line number Diff line number Diff line
@@ -446,17 +446,6 @@ static int __init pcibios_init(void) 


subsys_initcall(pcibios_init);



void __devinit pcibios_do_bus_setup(struct pci_bus *bus)

{

	struct pci_dev *dev;



	if (ppc_md.pci_dma_bus_setup)

		ppc_md.pci_dma_bus_setup(bus);



	list_for_each_entry(dev, &bus->devices, bus_list)

		pcibios_setup_new_device(dev);

}



/* the next one is stolen from the alpha port... */

void __init

pcibios_update_irq(struct pci_dev *dev, int irq)

arch/powerpc/kernel/pci_64.c

+0 −11
Original line number Diff line number Diff line
@@ -507,17 +507,6 @@ int __devinit pcibios_map_io_space(struct pci_bus *bus) 
}

EXPORT_SYMBOL_GPL(pcibios_map_io_space);



void __devinit pcibios_do_bus_setup(struct pci_bus *bus)

{

	struct pci_dev *dev;



	if (ppc_md.pci_dma_bus_setup)

		ppc_md.pci_dma_bus_setup(bus);



	list_for_each_entry(dev, &bus->devices, bus_list)

		pcibios_setup_new_device(dev);

}



unsigned long pci_address_to_pio(phys_addr_t address)

{

	struct pci_controller *hose, *tmp;