summaryrefslogtreecommitdiffstats
path: root/arch/x86/pci/irq.c
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2014-01-24 11:50:48 -0700
committerBjorn Helgaas <bhelgaas@google.com>2014-02-03 10:38:18 -0700
commit3d2a366190778f30a2f10b5edaf32bcb236840fd (patch)
treed60c3bd795cc5e4a39b9f58d0de2c56a38ddd639 /arch/x86/pci/irq.c
parent8d7d818676d3851b3ec0c94644e760d0bfac2608 (diff)
downloadtalos-obmc-linux-3d2a366190778f30a2f10b5edaf32bcb236840fd.tar.gz
talos-obmc-linux-3d2a366190778f30a2f10b5edaf32bcb236840fd.zip
x86/PCI: Use pcibios_scan_root() instead of pci_scan_bus_on_node()
pcibios_scan_root() looks up the bus's NUMA node, then calls pci_scan_bus_on_node(). This uses pcibios_scan_root() directly and drops the node lookup in the callers. Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'arch/x86/pci/irq.c')
-rw-r--r--arch/x86/pci/irq.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c
index 372e9b8989b3..8658874165c2 100644
--- a/arch/x86/pci/irq.c
+++ b/arch/x86/pci/irq.c
@@ -136,11 +136,9 @@ static void __init pirq_peer_trick(void)
busmap[e->bus] = 1;
}
for (i = 1; i < 256; i++) {
- int node;
if (!busmap[i] || pci_find_bus(0, i))
continue;
- node = get_mp_bus_to_node(i);
- if (pci_scan_bus_on_node(i, &pci_root_ops, node))
+ if (pcibios_scan_root(i))
printk(KERN_INFO "PCI: Discovered primary peer "
"bus %02x [IRQ]\n", i);
}
OpenPOWER on IntegriCloud