diff options
| author | Oliver O'Halloran <oohall@gmail.com> | 2019-10-28 09:54:24 +0100 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2020-01-06 06:25:29 +0100 |
| commit | 1c7f4fe86f17f296bafab1d418c040533324bf4f (patch) | |
| tree | 0654a7c6948469f8ce2a3890f5f2165e46f0b87e /arch/powerpc/kernel/pci-hotplug.c | |
| parent | powerpc/pci: Fix pcibios_setup_device() ordering (diff) | |
| download | linux-1c7f4fe86f17f296bafab1d418c040533324bf4f.tar.xz linux-1c7f4fe86f17f296bafab1d418c040533324bf4f.zip | |
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: Oliver O'Halloran <oohall@gmail.com>
Tested-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Reviewed-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20191028085424.12006-3-oohall@gmail.com
Diffstat (limited to 'arch/powerpc/kernel/pci-hotplug.c')
| -rw-r--r-- | arch/powerpc/kernel/pci-hotplug.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/pci-hotplug.c b/arch/powerpc/kernel/pci-hotplug.c index fc62c4bc47b1..d6a67f814983 100644 --- a/arch/powerpc/kernel/pci-hotplug.c +++ b/arch/powerpc/kernel/pci-hotplug.c @@ -134,7 +134,6 @@ void pci_hp_add_devices(struct pci_bus *bus) */ slotno = PCI_SLOT(PCI_DN(dn->child)->devfn); pci_scan_slot(bus, PCI_DEVFN(slotno, 0)); - pcibios_setup_bus_devices(bus); max = bus->busn_res.start; /* * Scan bridges that are already configured. We don't touch |