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>

3 files changed, 17 insertions, 12 deletions

diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c
index 06413b827e97..df639db779f9 100644
--- a/arch/ia64/pci/pci.c
+++ b/arch/ia64/pci/pci.c
@@ -298,18 +298,19 @@ static __devinit acpi_status add_window(struct acpi_resource *res, void *data)
         window->offset = offset;
 
         if (insert_resource(root, &window->resource)) {
-                dev_err(&info->bridge->dev, "can't allocate %pRt\n",
+                dev_err(&info->bridge->dev,
+                        "can't allocate host bridge window %pR\n",
                         &window->resource);
         } else {
                 if (offset)
-                        dev_info(&info->bridge->dev, "host bridge window: %pRt "
+                        dev_info(&info->bridge->dev, "host bridge window %pR "
                                  "(PCI address [%#llx-%#llx])\n",
                                  &window->resource,
                                  window->resource.start - offset,
                                  window->resource.end - offset);
                 else
                         dev_info(&info->bridge->dev,
-                                 "host bridge window: %pRt\n",
+                                 "host bridge window %pR\n",
                                  &window->resource);
         }
 
@@ -330,7 +331,9 @@ pcibios_setup_root_windows(struct pci_bus *bus, struct pci_controller *ctrl)
                     (res->end - res->start < 16))
                         continue;
                 if (j >= PCI_BUS_NUM_RESOURCES) {
-                        dev_warn(&bus->dev, "ignoring %pRf (no space)\n", res);
+                        dev_warn(&bus->dev,
+                                 "ignoring host bridge window %pR (no space)\n",
+                                 res);
                         continue;
                 }
                 bus->resource[j++] = res;
diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c
index 9b3daf976732..6bf8091d2fd5 100644
--- a/arch/x86/pci/acpi.c
+++ b/arch/x86/pci/acpi.c
@@ -108,18 +108,19 @@ setup_resource(struct acpi_resource *acpi_res, void *data)
         res->child = NULL;
 
         if (insert_resource(root, res)) {
-                dev_err(&info->bridge->dev, "can't allocate %pRt\n", res);
+                dev_err(&info->bridge->dev,
+                        "can't allocate host bridge window %pR\n", res);
         } else {
                 info->bus->resource[info->res_num] = res;
                 info->res_num++;
                 if (addr.translation_offset)
-                        dev_info(&info->bridge->dev, "host bridge window: %pRt "
+                        dev_info(&info->bridge->dev, "host bridge window %pR "
                                  "(PCI address [%#llx-%#llx])\n",
                                  res, res->start - addr.translation_offset,
                                  res->end - addr.translation_offset);
                 else
                         dev_info(&info->bridge->dev,
-                                 "host bridge window: %pRt\n", res);
+                                 "host bridge window %pR\n", res);
         }
         return AE_OK;
 }
diff --git a/arch/x86/pci/i386.c b/arch/x86/pci/i386.c
index 52e656f17781..d49d17de7b3f 100644
--- a/arch/x86/pci/i386.c
+++ b/arch/x86/pci/i386.c
@@ -129,7 +129,7 @@ static void __init pcibios_allocate_bus_resources(struct list_head *bus_list)
                                         continue;
                                 if (!r->start ||
                                     pci_claim_resource(dev, idx) < 0) {
-                                        dev_info(&dev->dev, "BAR %d: can't allocate %pRt\n", idx, r);
+                                        dev_info(&dev->dev, "BAR %d: can't allocate %pR\n", idx, r);
                                         /*
                                          * Something is wrong with the region.
                                          * Invalidate the resource to prevent
@@ -164,10 +164,11 @@ static void __init pcibios_allocate_resources(int pass)
                         else
                                 disabled = !(command & PCI_COMMAND_MEMORY);
                         if (pass == disabled) {
-                                dev_dbg(&dev->dev, "%pRf (d=%d, p=%d)\n", r,
-                                        disabled, pass);
+                                dev_dbg(&dev->dev,
+                                        "BAR %d: claiming %pr (d=%d, p=%d)\n",
+                                        idx, r, disabled, pass);
                                 if (pci_claim_resource(dev, idx) < 0) {
-                                        dev_info(&dev->dev, "BAR %d: can't allocate %pRt\n", idx, r);
+                                        dev_info(&dev->dev, "BAR %d: can't claim %pR\n", idx, r);
                                         /* We'll assign a new address later */
                                         r->end -= r->start;
                                         r->start = 0;
@@ -180,7 +181,7 @@ static void __init pcibios_allocate_resources(int pass)
                                 /* Turn the ROM off, leave the resource region,
                                  * but keep it unregistered. */
                                 u32 reg;
-                                dev_dbg(&dev->dev, "disabling ROM %pRt\n", r);
+                                dev_dbg(&dev->dev, "disabling ROM %pR\n", r);
                                 r->flags &= ~IORESOURCE_ROM_ENABLE;
                                 pci_read_config_dword(dev,
                                                 dev->rom_base_reg, &reg);