1 files changed, 18 insertions, 41 deletions

diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c
index 4f25ec077552..01edac6c5e18 100644
--- a/arch/x86/pci/acpi.c
+++ b/arch/x86/pci/acpi.c
@@ -218,9 +218,8 @@ static void teardown_mcfg_map(struct pci_root_info *info)
 }
 #endif
 
-static acpi_status
-resource_to_addr(struct acpi_resource *resource,
-                        struct acpi_resource_address64 *addr)
+static acpi_status resource_to_addr(struct acpi_resource *resource,
+                                    struct acpi_resource_address64 *addr)
 {
         acpi_status status;
         struct acpi_resource_memory24 *memory24;
@@ -265,8 +264,7 @@ resource_to_addr(struct acpi_resource *resource,
         return AE_ERROR;
 }
 
-static acpi_status
-count_resource(struct acpi_resource *acpi_res, void *data)
+static acpi_status count_resource(struct acpi_resource *acpi_res, void *data)
 {
         struct pci_root_info *info = data;
         struct acpi_resource_address64 addr;
@@ -278,8 +276,7 @@ count_resource(struct acpi_resource *acpi_res, void *data)
         return AE_OK;
 }
 
-static acpi_status
-setup_resource(struct acpi_resource *acpi_res, void *data)
+static acpi_status setup_resource(struct acpi_resource *acpi_res, void *data)
 {
         struct pci_root_info *info = data;
         struct resource *res;
@@ -435,9 +432,9 @@ static void release_pci_root_info(struct pci_host_bridge *bridge)
         __release_pci_root_info(info);
 }
 
-static void
-probe_pci_root_info(struct pci_root_info *info, struct acpi_device *device,
-                    int busnum, int domain)
+static void probe_pci_root_info(struct pci_root_info *info,
+                                struct acpi_device *device,
+                                int busnum, int domain)
 {
         size_t size;
 
@@ -473,16 +470,13 @@ probe_pci_root_info(struct pci_root_info *info, struct acpi_device *device,
 struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root)
 {
         struct acpi_device *device = root->device;
-        struct pci_root_info *info = NULL;
+        struct pci_root_info *info;
         int domain = root->segment;
         int busnum = root->secondary.start;
         LIST_HEAD(resources);
-        struct pci_bus *bus = NULL;
+        struct pci_bus *bus;
         struct pci_sysdata *sd;
         int node;
-#ifdef CONFIG_ACPI_NUMA
-        int pxm;
-#endif
 
         if (pci_ignore_seg)
                 domain = 0;
@@ -494,19 +488,12 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root)
                 return NULL;
         }
 
-        node = -1;
-#ifdef CONFIG_ACPI_NUMA
-        pxm = acpi_get_pxm(device->handle);
-        if (pxm >= 0)
-                node = pxm_to_node(pxm);
-        if (node != -1)
-                set_mp_bus_to_node(busnum, node);
-        else
-#endif
-                node = get_mp_bus_to_node(busnum);
+        node = acpi_get_node(device->handle);
+        if (node == NUMA_NO_NODE)
+                node = x86_pci_root_bus_node(busnum);
 
-        if (node != -1 && !node_online(node))
-                node = -1;
+        if (node != NUMA_NO_NODE && !node_online(node))
+                node = NUMA_NO_NODE;
 
         info = kzalloc(sizeof(*info), GFP_KERNEL);
         if (!info) {
@@ -519,15 +506,12 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root)
         sd->domain = domain;
         sd->node = node;
         sd->companion = device;
-        /*
-         * Maybe the desired pci bus has been already scanned. In such case
-         * it is unnecessary to scan the pci bus with the given domain,busnum.
-         */
+
         bus = pci_find_bus(domain, busnum);
         if (bus) {
                 /*
-                 * If the desired bus exits, the content of bus->sysdata will
-                 * be replaced by sd.
+                 * If the desired bus has been scanned already, replace
+                 * its bus->sysdata.
                  */
                 memcpy(bus->sysdata, sd, sizeof(*sd));
                 kfree(info);
@@ -572,15 +556,8 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root)
                         pcie_bus_configure_settings(child);
         }
 
-        if (bus && node != -1) {
-#ifdef CONFIG_ACPI_NUMA
-                if (pxm >= 0)
-                        dev_printk(KERN_DEBUG, &bus->dev,
-                                   "on NUMA node %d (pxm %d)\n", node, pxm);
-#else
+        if (bus && node != NUMA_NO_NODE)
                 dev_printk(KERN_DEBUG, &bus->dev, "on NUMA node %d\n", node);
-#endif
-        }
 
         return bus;
 }