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>
This commit is contained in:
committed by
Jesse Barnes
parent
4fd8bdc567
commit
c7dabef8a2
@@ -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;
|
||||
|
Reference in New Issue
Block a user