summaryrefslogtreecommitdiffstats
path: root/arch/x86/pci
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2014-01-28 16:28:21 -0700
committerBjorn Helgaas <bhelgaas@google.com>2014-02-03 10:36:24 -0700
commitf19e84824ac62d662a1d2b2b367f23b98bbd6d1d (patch)
tree70b5ff9ac71e14804be824a08a96889f3501fbe9 /arch/x86/pci
parent38dbfb59d1175ef458d006556061adeaa8751b72 (diff)
downloadop-kernel-dev-f19e84824ac62d662a1d2b2b367f23b98bbd6d1d.zip
op-kernel-dev-f19e84824ac62d662a1d2b2b367f23b98bbd6d1d.tar.gz
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>
Diffstat (limited to 'arch/x86/pci')
-rw-r--r--arch/x86/pci/common.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c
index 981c2db..c47bb22 100644
--- a/arch/x86/pci/common.c
+++ b/arch/x86/pci/common.c
@@ -458,15 +458,6 @@ void __init dmi_check_pciprobe(void)
struct pci_bus *pcibios_scan_root(int busnum)
{
- struct pci_bus *bus = NULL;
-
- while ((bus = pci_find_next_bus(bus)) != NULL) {
- if (bus->number == busnum) {
- /* Already scanned */
- return bus;
- }
- }
-
return pci_scan_bus_on_node(busnum, &pci_root_ops,
get_mp_bus_to_node(busnum));
}
OpenPOWER on IntegriCloud