x86/PCI: Increase info->res_num before checking pci_use_crs
authorYijing Wang <wangyijing@huawei.com>
Tue, 28 May 2013 02:55:09 +0000 (10:55 +0800)
committerBjorn Helgaas <bhelgaas@google.com>
Tue, 28 May 2013 17:09:16 +0000 (11:09 -0600)
We should increase info->res_num before we checking pci_use_crs return
when pci=nocrs set.

No functional change, since we don't use res_num and res_offset[]
in the "!pci_use_crs" case anyway, but this makes the code read better.

Signed-off-by: Yijing Wang <wangyijing@huawei.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Jiang Liu <liuj97@gmail.com>
Cc: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
Cc: Feng Tang <feng.tang@intel.com>
arch/x86/pci/acpi.c

index 3e72425..d641897 100644 (file)
@@ -324,14 +324,11 @@ setup_resource(struct acpi_resource *acpi_res, void *data)
        res->start = start;
        res->end = end;
        info->res_offset[info->res_num] = addr.translation_offset;
+       info->res_num++;
 
-       if (!pci_use_crs) {
+       if (!pci_use_crs)
                dev_printk(KERN_DEBUG, &info->bridge->dev,
                           "host bridge window %pR (ignored)\n", res);
-               return AE_OK;
-       }
-
-       info->res_num++;
 
        return AE_OK;
 }