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 /drivers/pci/pci.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 'drivers/pci/pci.c')
-rw-r--r-- | drivers/pci/pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 557218222826..f0da1676d2be 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c | |||
@@ -1713,7 +1713,7 @@ static int __pci_request_region(struct pci_dev *pdev, int bar, const char *res_n | |||
1713 | return 0; | 1713 | return 0; |
1714 | 1714 | ||
1715 | err_out: | 1715 | err_out: |
1716 | dev_warn(&pdev->dev, "BAR %d: can't reserve %pRt\n", bar, | 1716 | dev_warn(&pdev->dev, "BAR %d: can't reserve %pR\n", bar, |
1717 | &pdev->resource[bar]); | 1717 | &pdev->resource[bar]); |
1718 | return -EBUSY; | 1718 | return -EBUSY; |
1719 | } | 1719 | } |