vsprintf: use %pR, %pr instead of %pRt, %pRf

Jesse accidentally applied v1 [1] of the patchset instead of v2 [2].  This
is the diff between v1 and v2.

The changes in this patch are:
    - tidied vsprintf stack buffer to shrink and compute size more
      accurately
    - use %pR for decoding and %pr for "raw" (with type and flags) instead
      of adding %pRt and %pRf

[1] http://lkml.org/lkml/2009/10/6/491
[2] http://lkml.org/lkml/2009/10/13/441

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

1 files changed, 11 insertions, 9 deletions

diff --git a/drivers/pci/setup-res.c b/drivers/pci/setup-res.c
index 5e78f2096ce8..357ca5c54607 100644
--- a/drivers/pci/setup-res.c
+++ b/drivers/pci/setup-res.c
@@ -51,9 +51,11 @@ void pci_update_resource(struct pci_dev *dev, int resno)
 
         pcibios_resource_to_bus(dev, &region, res);
 
-        dev_dbg(&dev->dev, "BAR %d: got %pRf (bus addr [%#llx-%#llx])\n",
-                resno, res, (unsigned long long)region.start,
-                (unsigned long long)region.end);
+        dev_dbg(&dev->dev, "BAR %d: got res %pR bus [%#llx-%#llx] "
+                "flags %#lx\n", resno, res,
+                 (unsigned long long)region.start,
+                 (unsigned long long)region.end,
+                 (unsigned long)res->flags);
 
         new = region.start | (res->flags & PCI_REGION_FLAG_MASK);
         if (res->flags & IORESOURCE_IO)
@@ -89,8 +91,8 @@ void pci_update_resource(struct pci_dev *dev, int resno)
                 }
         }
         res->flags &= ~IORESOURCE_UNSET;
-        dev_dbg(&dev->dev, "BAR %d: moved to bus addr [%#llx-%#llx]\n",
-                resno, (unsigned long long)region.start,
+        dev_dbg(&dev->dev, "BAR %d: moved to %pR (bus addr [%#llx-%#llx])\n",
+                resno, res, (unsigned long long)region.start,
                 (unsigned long long)region.end);
 }
 
@@ -108,7 +110,7 @@ int pci_claim_resource(struct pci_dev *dev, int resource)
 
         if (err) {
                 const char *dtype = resource < PCI_BRIDGE_RESOURCES ? "device" : "bridge";
-                dev_err(&dev->dev, "BAR %d: %s %s %pRt\n",
+                dev_err(&dev->dev, "BAR %d: %s of %s %pR\n",
                         resource,
                         root ? "address space collision on" :
                                 "no parent found for",
@@ -179,7 +181,7 @@ int pci_assign_resource(struct pci_dev *dev, int resno)
 
         align = pci_resource_alignment(dev, res);
         if (!align) {
-                dev_info(&dev->dev, "BAR %d: can't allocate %pRf "
+                dev_info(&dev->dev, "BAR %d: can't allocate %pR "
                          "(bogus alignment)\n", resno, res);
                 return -EINVAL;
         }
@@ -196,7 +198,7 @@ int pci_assign_resource(struct pci_dev *dev, int resno)
         }
 
         if (ret)
-                dev_info(&dev->dev, "BAR %d: can't allocate %pRt\n",
+                dev_info(&dev->dev, "BAR %d: can't allocate %pR\n",
                          resno, res);
 
         return ret;
@@ -222,7 +224,7 @@ void pdev_sort_resources(struct pci_dev *dev, struct resource_list *head)
 
                 r_align = pci_resource_alignment(dev, r);
                 if (!r_align) {
-                        dev_warn(&dev->dev, "BAR %d: bogus alignment %pRf\n",
+                        dev_warn(&dev->dev, "BAR %d: %pR has bogus alignment\n",
                                  i, r);
                         continue;
                 }