PCI: print resources consistently with %pRt

This uses %pRt to print additional resource information (type, size,
prefetchability, etc.) consistently.

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

1 files changed, 8 insertions, 18 deletions

diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 8105e32117f6..2adb47574d86 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -222,6 +222,8 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
                 if (!sz64)
                         goto fail;
 
+                res->flags |= IORESOURCE_MEM_64;
+
                 if ((sizeof(resource_size_t) < 8) && (sz64 > 0x100000000ULL)) {
                         dev_err(&dev->dev, "can't handle 64-bit BAR\n");
                         goto fail;
@@ -234,14 +236,9 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
                 } else {
                         res->start = l64;
                         res->end = l64 + sz64;
-                        dev_printk(KERN_DEBUG, &dev->dev,
-                                "reg %x %s: %pR\n", pos,
-                                 (res->flags & IORESOURCE_PREFETCH) ?
-                                        "64bit mmio pref" : "64bit mmio",
-                                 res);
+                        dev_printk(KERN_DEBUG, &dev->dev, "reg %x: %pRt\n",
+                                   pos, res);
                 }
-
-                res->flags |= IORESOURCE_MEM_64;
         } else {
                 sz = pci_size(l, sz, mask);
 
@@ -251,11 +248,7 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
                 res->start = l;
                 res->end = l + sz;
 
-                dev_printk(KERN_DEBUG, &dev->dev, "reg %x %s: %pR\n", pos,
-                        (res->flags & IORESOURCE_IO) ? "io port" :
-                         ((res->flags & IORESOURCE_PREFETCH) ?
-                                 "32bit mmio pref" : "32bit mmio"),
-                        res);
+                dev_printk(KERN_DEBUG, &dev->dev, "reg %x: %pRt\n", pos, res);
         }
 
  out:
@@ -323,7 +316,7 @@ void __devinit pci_read_bridge_bases(struct pci_bus *child)
                         res->start = base;
                 if (!res->end)
                         res->end = limit + 0xfff;
-                dev_printk(KERN_DEBUG, &dev->dev, "bridge io port: %pR\n", res);
+                dev_printk(KERN_DEBUG, &dev->dev, "bridge window: %pRt\n", res);
         }
 
         res = child->resource[1];
@@ -335,8 +328,7 @@ void __devinit pci_read_bridge_bases(struct pci_bus *child)
                 res->flags = (mem_base_lo & PCI_MEMORY_RANGE_TYPE_MASK) | IORESOURCE_MEM;
                 res->start = base;
                 res->end = limit + 0xfffff;
-                dev_printk(KERN_DEBUG, &dev->dev, "bridge 32bit mmio: %pR\n",
-                        res);
+                dev_printk(KERN_DEBUG, &dev->dev, "bridge window: %pRt\n", res);
         }
 
         res = child->resource[2];
@@ -375,9 +367,7 @@ void __devinit pci_read_bridge_bases(struct pci_bus *child)
                         res->flags |= IORESOURCE_MEM_64;
                 res->start = base;
                 res->end = limit + 0xfffff;
-                dev_printk(KERN_DEBUG, &dev->dev, "bridge %sbit mmio pref: %pR\n",
-                        (res->flags & PCI_PREF_RANGE_TYPE_64) ? "64" : "32",
-                        res);
+                dev_printk(KERN_DEBUG, &dev->dev, "bridge window: %pRt\n", res);
         }
 }