4 files changed, 32 insertions, 18 deletions

diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
index d2f1354fd18..ea54cedcdfc 100644
--- a/drivers/pci/pci-sysfs.c
+++ b/drivers/pci/pci-sysfs.c
@@ -102,11 +102,13 @@ resource_show(struct device * dev, struct device_attribute *attr, char * buf)
         struct pci_dev * pci_dev = to_pci_dev(dev);
         char * str = buf;
         int i;
-        int max = 7;
+        int max;
         resource_size_t start, end;
 
         if (pci_dev->subordinate)
                 max = DEVICE_COUNT_RESOURCE;
+        else
+                max = PCI_BRIDGE_RESOURCES;
 
         for (i = 0; i < max; i++) {
                 struct resource *res =  &pci_dev->resource[i];
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 5dcf2b65e3f..e1cf5d50ed4 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -423,7 +423,7 @@ static struct pci_bus *pci_alloc_child_bus(struct pci_bus *parent,
         child->subordinate = 0xff;
 
         /* Set up default resource pointers and names.. */
-        for (i = 0; i < 4; i++) {
+        for (i = 0; i < PCI_BRIDGE_RESOURCE_NUM; i++) {
                 child->resource[i] = &bridge->resource[PCI_BRIDGE_RESOURCES+i];
                 child->resource[i]->name = child->name;
         }
diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c
index 7fb086d3961..593bb844b8d 100644
--- a/drivers/pci/proc.c
+++ b/drivers/pci/proc.c
@@ -361,15 +361,16 @@ static int show_device(struct seq_file *m, void *v)
                         dev->vendor,
                         dev->device,
                         dev->irq);
-        /* Here should be 7 and not PCI_NUM_RESOURCES as we need to preserve compatibility */
-        for (i=0; i<7; i++) {
+
+        /* only print standard and ROM resources to preserve compatibility */
+        for (i = 0; i <= PCI_ROM_RESOURCE; i++) {
                 resource_size_t start, end;
                 pci_resource_to_user(dev, i, &dev->resource[i], &start, &end);
                 seq_printf(m, "\t%16llx",
                         (unsigned long long)(start |
                         (dev->resource[i].flags & PCI_REGION_FLAG_MASK)));
         }
-        for (i=0; i<7; i++) {
+        for (i = 0; i <= PCI_ROM_RESOURCE; i++) {
                 resource_size_t start, end;
                 pci_resource_to_user(dev, i, &dev->resource[i], &start, &end);
                 seq_printf(m, "\t%16llx",
diff --git a/include/linux/pci.h b/include/linux/pci.h
index c5e02f324e1..da1c22bab40 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -82,7 +82,30 @@ enum pci_mmap_state {
 #define PCI_DMA_FROMDEVICE      2
 #define PCI_DMA_NONE            3
 
-#define DEVICE_COUNT_RESOURCE   12
+/*
+ *  For PCI devices, the region numbers are assigned this way:
+ */
+enum {
+        /* #0-5: standard PCI resources */
+        PCI_STD_RESOURCES,
+        PCI_STD_RESOURCE_END = 5,
+
+        /* #6: expansion ROM resource */
+        PCI_ROM_RESOURCE,
+
+        /* resources assigned to buses behind the bridge */
+#define PCI_BRIDGE_RESOURCE_NUM 4
+
+        PCI_BRIDGE_RESOURCES,
+        PCI_BRIDGE_RESOURCE_END = PCI_BRIDGE_RESOURCES +
+                                  PCI_BRIDGE_RESOURCE_NUM - 1,
+
+        /* total resources associated with a PCI device */
+        PCI_NUM_RESOURCES,
+
+        /* preserve this for compatibility */
+        DEVICE_COUNT_RESOURCE
+};
 
 typedef int __bitwise pci_power_t;
 
@@ -274,18 +297,6 @@ static inline void pci_add_saved_cap(struct pci_dev *pci_dev,
         hlist_add_head(&new_cap->next, &pci_dev->saved_cap_space);
 }
 
-/*
- *  For PCI devices, the region numbers are assigned this way:
- *
- *      0-5     standard PCI regions
- *      6       expansion ROM
- *      7-10    bridges: address space assigned to buses behind the bridge
- */
-
-#define PCI_ROM_RESOURCE        6
-#define PCI_BRIDGE_RESOURCES    7
-#define PCI_NUM_RESOURCES       11
-
 #ifndef PCI_BUS_NUM_RESOURCES
 #define PCI_BUS_NUM_RESOURCES   16
 #endif