]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[IA64] pci_acpi_scan_root cleanup
authorLuck, Tony <tony.luck@intel.com>
Fri, 15 Aug 2008 22:37:48 +0000 (15:37 -0700)
committerTony Luck <tony.luck@intel.com>
Mon, 18 Aug 2008 22:41:21 +0000 (15:41 -0700)
The code walks all the acpi _CRS methods to see how many windows
to allocate.  It then scans them all again to insert_resource()
for each *even if the first scan found that there were none*.

Move the second scan inside the "if (windows)" clause.

Signed-off-by: Tony Luck <tony.luck@intel.com>
arch/ia64/pci/pci.c

index 77b15f80f1011eec04b8a63b6b62448b49fe9bb8..7545037a86254f1f5da925f9b96f80fafcfc1a33 100644 (file)
@@ -324,7 +324,6 @@ pcibios_setup_root_windows(struct pci_bus *bus, struct pci_controller *ctrl)
 struct pci_bus * __devinit
 pci_acpi_scan_root(struct acpi_device *device, int domain, int bus)
 {
-       struct pci_root_info info;
        struct pci_controller *controller;
        unsigned int windows = 0;
        struct pci_bus *pbus;
@@ -346,22 +345,24 @@ pci_acpi_scan_root(struct acpi_device *device, int domain, int bus)
        acpi_walk_resources(device->handle, METHOD_NAME__CRS, count_window,
                        &windows);
        if (windows) {
+               struct pci_root_info info;
+
                controller->window =
                        kmalloc_node(sizeof(*controller->window) * windows,
                                     GFP_KERNEL, controller->node);
                if (!controller->window)
                        goto out2;
-       }
 
-       name = kmalloc(16, GFP_KERNEL);
-       if (!name)
-               goto out3;
+               name = kmalloc(16, GFP_KERNEL);
+               if (!name)
+                       goto out3;
 
-       sprintf(name, "PCI Bus %04x:%02x", domain, bus);
-       info.controller = controller;
-       info.name = name;
-       acpi_walk_resources(device->handle, METHOD_NAME__CRS, add_window,
-                       &info);
+               sprintf(name, "PCI Bus %04x:%02x", domain, bus);
+               info.controller = controller;
+               info.name = name;
+               acpi_walk_resources(device->handle, METHOD_NAME__CRS,
+                       add_window, &info);
+       }
        /*
         * See arch/x86/pci/acpi.c.
         * The desired pci bus might already be scanned in a quirk. We