diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2014-01-28 18:28:21 -0500 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-02-03 12:36:24 -0500 |
commit | f19e84824ac62d662a1d2b2b367f23b98bbd6d1d (patch) | |
tree | 70b5ff9ac71e14804be824a08a96889f3501fbe9 | |
parent | 38dbfb59d1175ef458d006556061adeaa8751b72 (diff) |
x86/PCI: Drop pcibios_scan_root() check for bus already scanned
The PCI core checks to see whether we've already scanned a bus, so we don't
need to do it in pcibios_scan_root(). Here's where it happens in the core:
pcibios_scan_root
pci_scan_bus_on_node
pci_scan_root_bus
pci_create_root_bus
b2 = pci_find_bus(pci_domain_nr(b), bus)
if (b2)
goto err_out; # already scanned this bus
This removes the check from pcibios_scan_root().
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-rw-r--r-- | arch/x86/pci/common.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c index 981c2dbd72cc..c47bb2288bb9 100644 --- a/arch/x86/pci/common.c +++ b/arch/x86/pci/common.c | |||
@@ -458,15 +458,6 @@ void __init dmi_check_pciprobe(void) | |||
458 | 458 | ||
459 | struct pci_bus *pcibios_scan_root(int busnum) | 459 | struct pci_bus *pcibios_scan_root(int busnum) |
460 | { | 460 | { |
461 | struct pci_bus *bus = NULL; | ||
462 | |||
463 | while ((bus = pci_find_next_bus(bus)) != NULL) { | ||
464 | if (bus->number == busnum) { | ||
465 | /* Already scanned */ | ||
466 | return bus; | ||
467 | } | ||
468 | } | ||
469 | |||
470 | return pci_scan_bus_on_node(busnum, &pci_root_ops, | 461 | return pci_scan_bus_on_node(busnum, &pci_root_ops, |
471 | get_mp_bus_to_node(busnum)); | 462 | get_mp_bus_to_node(busnum)); |
472 | } | 463 | } |