4 files changed, 33 insertions, 52 deletions

diff --git a/arch/i386/pci/mmconfig-shared.c b/arch/i386/pci/mmconfig-shared.c
index 77de6de94f1..4ea0852487a 100644
--- a/arch/i386/pci/mmconfig-shared.c
+++ b/arch/i386/pci/mmconfig-shared.c
@@ -22,10 +22,6 @@
 #define MMCONFIG_APER_MIN       (2 * 1024*1024)
 #define MMCONFIG_APER_MAX       (256 * 1024*1024)
 
-/* Verify the first 16 busses. We assume that systems with more busses
-   get MCFG right. */
-#define PCI_MMCFG_MAX_CHECK_BUS 16
-
 DECLARE_BITMAP(pci_mmcfg_fallback_slots, 32*PCI_MMCFG_MAX_CHECK_BUS);
 
 /* K8 systems have some devices (typically in the builtin northbridge)
@@ -34,29 +30,30 @@ DECLARE_BITMAP(pci_mmcfg_fallback_slots, 32*PCI_MMCFG_MAX_CHECK_BUS);
    and assigning suitable _SEGs, but this isn't implemented in some BIOS.
    Instead try to discover all devices on bus 0 that are unreachable using MM
    and fallback for them. */
-static __init void unreachable_devices(void)
+static void __init unreachable_devices(void)
 {
-        int i, k;
+        int i, bus;
         /* Use the max bus number from ACPI here? */
-        for (k = 0; k < PCI_MMCFG_MAX_CHECK_BUS; k++) {
+        for (bus = 0; bus < PCI_MMCFG_MAX_CHECK_BUS; bus++) {
                 for (i = 0; i < 32; i++) {
+                        unsigned int devfn = PCI_DEVFN(i, 0);
                         u32 val1, val2;
 
-                        pci_conf1_read(0, k, PCI_DEVFN(i,0), 0, 4, &val1);
+                        pci_conf1_read(0, bus, devfn, 0, 4, &val1);
                         if (val1 == 0xffffffff)
                                 continue;
 
-                        raw_pci_ops->read(0, k, PCI_DEVFN(i, 0), 0, 4, &val2);
+                        raw_pci_ops->read(0, bus, devfn, 0, 4, &val2);
                         if (val1 != val2) {
-                                set_bit(i + 32*k, pci_mmcfg_fallback_slots);
+                                set_bit(i + 32 * bus, pci_mmcfg_fallback_slots);
                                 printk(KERN_NOTICE "PCI: No mmconfig possible"
-                                       " on device %02x:%02x\n", k, i);
+                                       " on device %02x:%02x\n", bus, i);
                         }
                 }
         }
 }
 
-static __init const char *pci_mmcfg_e7520(void)
+static const char __init *pci_mmcfg_e7520(void)
 {
         u32 win;
         pci_conf1_read(0, 0, PCI_DEVFN(0,0), 0xce, 2, &win);
@@ -73,7 +70,7 @@ static __init const char *pci_mmcfg_e7520(void)
         return "Intel Corporation E7520 Memory Controller Hub";
 }
 
-static __init const char *pci_mmcfg_intel_945(void)
+static const char __init *pci_mmcfg_intel_945(void)
 {
         u32 pciexbar, mask = 0, len = 0;
 
@@ -128,7 +125,7 @@ struct pci_mmcfg_hostbridge_probe {
         const char *(*probe)(void);
 };
 
-static __initdata struct pci_mmcfg_hostbridge_probe pci_mmcfg_probes[] = {
+static struct pci_mmcfg_hostbridge_probe pci_mmcfg_probes[] __initdata = {
         { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_E7520_MCH, pci_mmcfg_e7520 },
         { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82945G_HB, pci_mmcfg_intel_945 },
 };
@@ -148,25 +145,21 @@ static int __init pci_mmcfg_check_hostbridge(void)
         pci_mmcfg_config = NULL;
         name = NULL;
 
-        for (i = 0; !name && i < ARRAY_SIZE(pci_mmcfg_probes); i++)
-                if ((pci_mmcfg_probes[i].vendor == PCI_ANY_ID ||
-                     pci_mmcfg_probes[i].vendor == vendor) &&
-                    (pci_mmcfg_probes[i].device == PCI_ANY_ID ||
-                     pci_mmcfg_probes[i].device == device))
+        for (i = 0; !name && i < ARRAY_SIZE(pci_mmcfg_probes); i++) {
+                if (pci_mmcfg_probes[i].vendor == vendor &&
+                    pci_mmcfg_probes[i].device == device)
                         name = pci_mmcfg_probes[i].probe();
+        }
 
         if (name) {
-                if (pci_mmcfg_config_num)
-                        printk(KERN_INFO "PCI: Found %s with MMCONFIG support.\n", name);
-                else
-                        printk(KERN_INFO "PCI: Found %s without MMCONFIG support.\n",
-                               name);
+                printk(KERN_INFO "PCI: Found %s %s MMCONFIG support.\n",
+                       name, pci_mmcfg_config_num ? "with" : "without");
         }
 
         return name != NULL;
 }
 
-static __init void pci_mmcfg_insert_resources(void)
+static void __init pci_mmcfg_insert_resources(void)
 {
 #define PCI_MMCFG_RESOURCE_NAME_LEN 19
         int i;
@@ -176,7 +169,6 @@ static __init void pci_mmcfg_insert_resources(void)
 
         res = kcalloc(PCI_MMCFG_RESOURCE_NAME_LEN + sizeof(*res),
                         pci_mmcfg_config_num, GFP_KERNEL);
-
         if (!res) {
                 printk(KERN_ERR "PCI: Unable to allocate MMCONFIG resources\n");
                 return;
@@ -184,12 +176,12 @@ static __init void pci_mmcfg_insert_resources(void)
 
         names = (void *)&res[pci_mmcfg_config_num];
         for (i = 0; i < pci_mmcfg_config_num; i++, res++) {
-                num_buses = pci_mmcfg_config[i].end_bus_number -
-                    pci_mmcfg_config[i].start_bus_number + 1;
+                struct acpi_mcfg_allocation *cfg = &pci_mmcfg_config[i];
+                num_buses = cfg->end_bus_number - cfg->start_bus_number + 1;
                 res->name = names;
                 snprintf(names, PCI_MMCFG_RESOURCE_NAME_LEN, "PCI MMCONFIG %u",
-                        pci_mmcfg_config[i].pci_segment);
-                res->start = pci_mmcfg_config[i].address;
+                         cfg->pci_segment);
+                res->start = cfg->address;
                 res->end = res->start + (num_buses << 20) - 1;
                 res->flags = IORESOURCE_MEM | IORESOURCE_BUSY;
                 insert_resource(&iomem_resource, res);
diff --git a/arch/i386/pci/mmconfig.c b/arch/i386/pci/mmconfig.c
index 3325b79e651..11be089efd7 100644
--- a/arch/i386/pci/mmconfig.c
+++ b/arch/i386/pci/mmconfig.c
@@ -27,22 +27,17 @@ static int mmcfg_last_accessed_cpu;
  */
 static u32 get_base_addr(unsigned int seg, int bus, unsigned devfn)
 {
-        int cfg_num = -1;
         struct acpi_mcfg_allocation *cfg;
+        int cfg_num;
 
         if (seg == 0 && bus < PCI_MMCFG_MAX_CHECK_BUS &&
             test_bit(PCI_SLOT(devfn) + 32*bus, pci_mmcfg_fallback_slots))
                 return 0;
 
-        while (1) {
-                ++cfg_num;
-                if (cfg_num >= pci_mmcfg_config_num) {
-                        break;
-                }
+        for (cfg_num = 0; cfg_num < pci_mmcfg_config_num; cfg_num++) {
                 cfg = &pci_mmcfg_config[cfg_num];
-                if (cfg->pci_segment != seg)
-                        continue;
-                if ((cfg->start_bus_number <= bus) &&
+                if (cfg->pci_segment == seg &&
+                    (cfg->start_bus_number <= bus) &&
                     (cfg->end_bus_number >= bus))
                         return cfg->address;
         }
diff --git a/arch/i386/pci/pci.h b/arch/i386/pci/pci.h
index 0270c80d99c..2ce3d44b09d 100644
--- a/arch/i386/pci/pci.h
+++ b/arch/i386/pci/pci.h
@@ -96,7 +96,9 @@ extern void pcibios_sort(void);
 
 /* pci-mmconfig.c */
 
+/* Verify the first 16 busses. We assume that systems with more busses
+   get MCFG right. */
 #define PCI_MMCFG_MAX_CHECK_BUS 16
 extern DECLARE_BITMAP(pci_mmcfg_fallback_slots, 32*PCI_MMCFG_MAX_CHECK_BUS);
 
-extern int pci_mmcfg_arch_init(void);
+extern int __init pci_mmcfg_arch_init(void);
diff --git a/arch/x86_64/pci/mmconfig.c b/arch/x86_64/pci/mmconfig.c
index 50512a8fc9e..918fc5b95a0 100644
--- a/arch/x86_64/pci/mmconfig.c
+++ b/arch/x86_64/pci/mmconfig.c
@@ -13,10 +13,6 @@
 
 #include "pci.h"
 
-/* Verify the first 16 busses. We assume that systems with more busses
-   get MCFG right. */
-#define PCI_MMCFG_MAX_CHECK_BUS 16
-
 /* Static virtual mapping of the MMCONFIG aperture */
 struct mmcfg_virt {
         struct acpi_mcfg_allocation *cfg;
@@ -26,17 +22,13 @@ static struct mmcfg_virt *pci_mmcfg_virt;
 
 static char __iomem *get_virt(unsigned int seg, unsigned bus)
 {
-        int cfg_num = -1;
         struct acpi_mcfg_allocation *cfg;
+        int cfg_num;
 
-        while (1) {
-                ++cfg_num;
-                if (cfg_num >= pci_mmcfg_config_num)
-                        break;
+        for (cfg_num = 0; cfg_num < pci_mmcfg_config_num; cfg_num++) {
                 cfg = pci_mmcfg_virt[cfg_num].cfg;
-                if (cfg->pci_segment != seg)
-                        continue;
-                if ((cfg->start_bus_number <= bus) &&
+                if (cfg->pci_segment == seg &&
+                    (cfg->start_bus_number <= bus) &&
                     (cfg->end_bus_number >= bus))
                         return pci_mmcfg_virt[cfg_num].virt;
         }