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>

4 files changed, 9 insertions, 8 deletions

diff --git a/drivers/pnp/quirks.c b/drivers/pnp/quirks.c
index 3a2031b25c3c..dfbd5a6cc58b 100644
--- a/drivers/pnp/quirks.c
+++ b/drivers/pnp/quirks.c
@@ -285,8 +285,9 @@ static void quirk_system_pci_resources(struct pnp_dev *dev)
                                  * the PCI region, and that might prevent a PCI
                                  * driver from requesting its resources.
                                  */
-                                dev_warn(&dev->dev, "resource %pRt overlaps %s "
-                                         "BAR %d %pRt, disabling\n", res,
+                                dev_warn(&dev->dev,
+                                         "disabling %pR because it overlaps "
+                                         "%s BAR %d %pR\n", res,
                                          pci_name(pdev), i, &pdev->resource[i]);
                                 res->flags |= IORESOURCE_DISABLED;
                         }
diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c
index 18557d7bb0b9..64d0596bafb5 100644
--- a/drivers/pnp/resource.c
+++ b/drivers/pnp/resource.c
@@ -517,7 +517,7 @@ struct pnp_resource *pnp_add_irq_resource(struct pnp_dev *dev, int irq,
         res->start = irq;
         res->end = irq;
 
-        pnp_dbg(&dev->dev, "  add %pRf\n", res);
+        pnp_dbg(&dev->dev, "  add %pr\n", res);
         return pnp_res;
 }
 
@@ -538,7 +538,7 @@ struct pnp_resource *pnp_add_dma_resource(struct pnp_dev *dev, int dma,
         res->start = dma;
         res->end = dma;
 
-        pnp_dbg(&dev->dev, "  add %pRf\n", res);
+        pnp_dbg(&dev->dev, "  add %pr\n", res);
         return pnp_res;
 }
 
@@ -562,7 +562,7 @@ struct pnp_resource *pnp_add_io_resource(struct pnp_dev *dev,
         res->start = start;
         res->end = end;
 
-        pnp_dbg(&dev->dev, "  add %pRf\n", res);
+        pnp_dbg(&dev->dev, "  add %pr\n", res);
         return pnp_res;
 }
 
@@ -586,7 +586,7 @@ struct pnp_resource *pnp_add_mem_resource(struct pnp_dev *dev,
         res->start = start;
         res->end = end;
 
-        pnp_dbg(&dev->dev, "  add %pRf\n", res);
+        pnp_dbg(&dev->dev, "  add %pr\n", res);
         return pnp_res;
 }
 
diff --git a/drivers/pnp/support.c b/drivers/pnp/support.c
index 1f8a33b0abac..9585c1c1cc36 100644
--- a/drivers/pnp/support.c
+++ b/drivers/pnp/support.c
@@ -82,7 +82,7 @@ void dbg_pnp_show_resources(struct pnp_dev *dev, char *desc)
         else {
                 pnp_dbg(&dev->dev, "%s: current resources:\n", desc);
                 list_for_each_entry(pnp_res, &dev->resources, list)
-                        pnp_dbg(&dev->dev, "%pRf\n", &pnp_res->res);
+                        pnp_dbg(&dev->dev, "%pr\n", &pnp_res->res);
         }
 }
 
diff --git a/drivers/pnp/system.c b/drivers/pnp/system.c
index 242d3a872011..49c1720df59a 100644
--- a/drivers/pnp/system.c
+++ b/drivers/pnp/system.c
@@ -48,7 +48,7 @@ static void reserve_range(struct pnp_dev *dev, struct resource *r, int port)
          * example do reserve stuff they know about too, so we may well
          * have double reservations.
          */
-        dev_info(&dev->dev, "%pRt %s reserved\n", r,
+        dev_info(&dev->dev, "%pR %s reserved\n", r,
                  res ? "has been" : "could not be");
 }