Commit 1c7f4fe8 authored by Oliver O'Halloran's avatar Oliver O'Halloran Committed by Michael Ellerman

powerpc/pci: Remove pcibios_setup_bus_devices()

With the previous patch applied pcibios_setup_device() will always be run
when pcibios_bus_add_device() is called. There are several code paths where
pcibios_setup_bus_device() is still called (the PowerPC specific PCI
hotplug support is one) so with just the previous patch applied the setup
can be run multiple times on a device, once before the device is added
to the bus and once after.

There's no need to run the setup in the early case any more so just
remove it entirely.
Signed-off-by: default avatarOliver O'Halloran <oohall@gmail.com>
Tested-by: default avatarAlexey Kardashevskiy <aik@ozlabs.ru>
Reviewed-by: default avatarAlexey Kardashevskiy <aik@ozlabs.ru>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20191028085424.12006-3-oohall@gmail.com
parent 30d87ef8
...@@ -113,7 +113,6 @@ extern pgprot_t pci_phys_mem_access_prot(struct file *file, ...@@ -113,7 +113,6 @@ extern pgprot_t pci_phys_mem_access_prot(struct file *file,
pgprot_t prot); pgprot_t prot);
extern resource_size_t pcibios_io_space_offset(struct pci_controller *hose); extern resource_size_t pcibios_io_space_offset(struct pci_controller *hose);
extern void pcibios_setup_bus_devices(struct pci_bus *bus);
extern void pcibios_setup_bus_self(struct pci_bus *bus); extern void pcibios_setup_bus_self(struct pci_bus *bus);
extern void pcibios_setup_phb_io_space(struct pci_controller *hose); extern void pcibios_setup_phb_io_space(struct pci_controller *hose);
extern void pcibios_scan_phb(struct pci_controller *hose); extern void pcibios_scan_phb(struct pci_controller *hose);
......
...@@ -1000,24 +1000,6 @@ int pcibios_add_device(struct pci_dev *dev) ...@@ -1000,24 +1000,6 @@ int pcibios_add_device(struct pci_dev *dev)
return 0; return 0;
} }
void pcibios_setup_bus_devices(struct pci_bus *bus)
{
struct pci_dev *dev;
pr_debug("PCI: Fixup bus devices %d (%s)\n",
bus->number, bus->self ? pci_name(bus->self) : "PHB");
list_for_each_entry(dev, &bus->devices, bus_list) {
/* Cardbus can call us to add new devices to a bus, so ignore
* those who are already fully discovered
*/
if (pci_dev_is_added(dev))
continue;
pcibios_setup_device(dev);
}
}
void pcibios_set_master(struct pci_dev *dev) void pcibios_set_master(struct pci_dev *dev)
{ {
/* No special bus mastering setup handling */ /* No special bus mastering setup handling */
...@@ -1036,13 +1018,6 @@ void pcibios_fixup_bus(struct pci_bus *bus) ...@@ -1036,13 +1018,6 @@ void pcibios_fixup_bus(struct pci_bus *bus)
} }
EXPORT_SYMBOL(pcibios_fixup_bus); EXPORT_SYMBOL(pcibios_fixup_bus);
void pci_fixup_cardbus(struct pci_bus *bus)
{
/* Now fixup devices on that bus */
pcibios_setup_bus_devices(bus);
}
static int skip_isa_ioresource_align(struct pci_dev *dev) static int skip_isa_ioresource_align(struct pci_dev *dev)
{ {
if (pci_has_flag(PCI_CAN_SKIP_ISA_ALIGN) && if (pci_has_flag(PCI_CAN_SKIP_ISA_ALIGN) &&
......
...@@ -134,7 +134,6 @@ void pci_hp_add_devices(struct pci_bus *bus) ...@@ -134,7 +134,6 @@ void pci_hp_add_devices(struct pci_bus *bus)
*/ */
slotno = PCI_SLOT(PCI_DN(dn->child)->devfn); slotno = PCI_SLOT(PCI_DN(dn->child)->devfn);
pci_scan_slot(bus, PCI_DEVFN(slotno, 0)); pci_scan_slot(bus, PCI_DEVFN(slotno, 0));
pcibios_setup_bus_devices(bus);
max = bus->busn_res.start; max = bus->busn_res.start;
/* /*
* Scan bridges that are already configured. We don't touch * Scan bridges that are already configured. We don't touch
......
...@@ -414,7 +414,6 @@ static void __of_scan_bus(struct device_node *node, struct pci_bus *bus, ...@@ -414,7 +414,6 @@ static void __of_scan_bus(struct device_node *node, struct pci_bus *bus,
*/ */
if (!rescan_existing) if (!rescan_existing)
pcibios_setup_bus_self(bus); pcibios_setup_bus_self(bus);
pcibios_setup_bus_devices(bus);
/* Now scan child busses */ /* Now scan child busses */
for_each_pci_bridge(dev, bus) for_each_pci_bridge(dev, bus)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment