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/ia64/pci | |
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/ia64/pci')
-rw-r--r-- | arch/ia64/pci/pci.c | 11 |
1 files changed, 7 insertions, 4 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) | |||
298 | window->offset = offset; | 298 | window->offset = offset; |
299 | 299 | ||
300 | if (insert_resource(root, &window->resource)) { | 300 | if (insert_resource(root, &window->resource)) { |
301 | dev_err(&info->bridge->dev, "can't allocate %pRt\n", | 301 | dev_err(&info->bridge->dev, |
302 | "can't allocate host bridge window %pR\n", | ||
302 | &window->resource); | 303 | &window->resource); |
303 | } else { | 304 | } else { |
304 | if (offset) | 305 | if (offset) |
305 | dev_info(&info->bridge->dev, "host bridge window: %pRt " | 306 | dev_info(&info->bridge->dev, "host bridge window %pR " |
306 | "(PCI address [%#llx-%#llx])\n", | 307 | "(PCI address [%#llx-%#llx])\n", |
307 | &window->resource, | 308 | &window->resource, |
308 | window->resource.start - offset, | 309 | window->resource.start - offset, |
309 | window->resource.end - offset); | 310 | window->resource.end - offset); |
310 | else | 311 | else |
311 | dev_info(&info->bridge->dev, | 312 | dev_info(&info->bridge->dev, |
312 | "host bridge window: %pRt\n", | 313 | "host bridge window %pR\n", |
313 | &window->resource); | 314 | &window->resource); |
314 | } | 315 | } |
315 | 316 | ||
@@ -330,7 +331,9 @@ pcibios_setup_root_windows(struct pci_bus *bus, struct pci_controller *ctrl) | |||
330 | (res->end - res->start < 16)) | 331 | (res->end - res->start < 16)) |
331 | continue; | 332 | continue; |
332 | if (j >= PCI_BUS_NUM_RESOURCES) { | 333 | if (j >= PCI_BUS_NUM_RESOURCES) { |
333 | dev_warn(&bus->dev, "ignoring %pRf (no space)\n", res); | 334 | dev_warn(&bus->dev, |
335 | "ignoring host bridge window %pR (no space)\n", | ||
336 | res); | ||
334 | continue; | 337 | continue; |
335 | } | 338 | } |
336 | bus->resource[j++] = res; | 339 | bus->resource[j++] = res; |