diff options
author | Bjorn Helgaas <bjorn.helgaas@hp.com> | 2009-10-27 15:26:47 -0400 |
---|---|---|
committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2009-11-04 16:06:41 -0500 |
commit | c7dabef8a2c59e6a3de9d66fc35fb6a43ef7172d (patch) | |
tree | 0f8b0021e693a0e380ef9026083b59d0909dffc6 /arch/x86/pci/acpi.c | |
parent | 4fd8bdc567e70c02fab7eeaaa7d2a64232add789 (diff) |
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>
Diffstat (limited to 'arch/x86/pci/acpi.c')
-rw-r--r-- | arch/x86/pci/acpi.c | 7 |
1 files changed, 4 insertions, 3 deletions
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) | |||
108 | res->child = NULL; | 108 | res->child = NULL; |
109 | 109 | ||
110 | if (insert_resource(root, res)) { | 110 | if (insert_resource(root, res)) { |
111 | dev_err(&info->bridge->dev, "can't allocate %pRt\n", res); | 111 | dev_err(&info->bridge->dev, |
112 | "can't allocate host bridge window %pR\n", res); | ||
112 | } else { | 113 | } else { |
113 | info->bus->resource[info->res_num] = res; | 114 | info->bus->resource[info->res_num] = res; |
114 | info->res_num++; | 115 | info->res_num++; |
115 | if (addr.translation_offset) | 116 | if (addr.translation_offset) |
116 | dev_info(&info->bridge->dev, "host bridge window: %pRt " | 117 | dev_info(&info->bridge->dev, "host bridge window %pR " |
117 | "(PCI address [%#llx-%#llx])\n", | 118 | "(PCI address [%#llx-%#llx])\n", |
118 | res, res->start - addr.translation_offset, | 119 | res, res->start - addr.translation_offset, |
119 | res->end - addr.translation_offset); | 120 | res->end - addr.translation_offset); |
120 | else | 121 | else |
121 | dev_info(&info->bridge->dev, | 122 | dev_info(&info->bridge->dev, |
122 | "host bridge window: %pRt\n", res); | 123 | "host bridge window %pR\n", res); |
123 | } | 124 | } |
124 | return AE_OK; | 125 | return AE_OK; |
125 | } | 126 | } |