x86/PCI: Use x86_pci_root_bus_node() instead of get_mp_bus_to_node()

This replaces all uses of get_mp_bus_to_node() with x86_pci_root_bus_node().

I think these uses are all on root buses, except possibly for blind
probing, where NUMA node information is unimportant.

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

2 files changed, 2 insertions, 2 deletions

diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c
index 4f25ec077552..3f42c5c05bf6 100644
--- a/arch/x86/pci/acpi.c
+++ b/arch/x86/pci/acpi.c
@@ -503,7 +503,7 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root)
                 set_mp_bus_to_node(busnum, node);
         else
 #endif
-                node = get_mp_bus_to_node(busnum);
+                node = x86_pci_root_bus_node(busnum);
 
         if (node != -1 && !node_online(node))
                 node = -1;
diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c
index 600e5925f1a4..f7d6800f10d1 100644
--- a/arch/x86/pci/common.c
+++ b/arch/x86/pci/common.c
@@ -467,7 +467,7 @@ void pcibios_scan_root(int busnum)
                 printk(KERN_ERR "PCI: OOM, skipping PCI bus %02x\n", busnum);
                 return;
         }
-        sd->node = get_mp_bus_to_node(busnum);
+        sd->node = x86_pci_root_bus_node(busnum);
         x86_pci_root_bus_resources(busnum, &resources);
         printk(KERN_DEBUG "PCI: Probing PCI hardware (bus %02x)\n", busnum);
         bus = pci_scan_root_bus(NULL, busnum, &pci_root_ops, sd, &resources);