summaryrefslogtreecommitdiffstats
path: root/drivers/pci/access.c
diff options
context:
space:
mode:
authorRyan Desfosses2014-04-19 02:13:50 +0200
committerBjorn Helgaas2014-06-11 04:20:42 +0200
commit227f06470502c4fea3d93df1f12a77e3e37f6263 (patch)
tree817a80fa89d17305a47a3e4e4012d36ae6cac36c /drivers/pci/access.c
parentPCI: Whitespace cleanup (diff)
downloadkernel-qcow2-linux-227f06470502c4fea3d93df1f12a77e3e37f6263.tar.gz
kernel-qcow2-linux-227f06470502c4fea3d93df1f12a77e3e37f6263.tar.xz
kernel-qcow2-linux-227f06470502c4fea3d93df1f12a77e3e37f6263.zip
PCI: Merge multi-line quoted strings
Merge quoted strings that are broken across lines into a single entity. The compiler merges them anyway, but checkpatch complains about it, and merging them makes it easier to grep for strings. No functional change. [bhelgaas: changelog, do the same for everything under drivers/pci] Signed-off-by: Ryan Desfosses <ryan@desfo.org> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'drivers/pci/access.c')
-rw-r--r--drivers/pci/access.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/pci/access.c b/drivers/pci/access.c
index 8c148f39e8d7..d292d7cb3417 100644
--- a/drivers/pci/access.c
+++ b/drivers/pci/access.c
@@ -231,10 +231,7 @@ static int pci_vpd_pci22_wait(struct pci_dev *dev)
}
if (time_after(jiffies, timeout)) {
- dev_printk(KERN_DEBUG, &dev->dev,
- "vpd r/w failed. This is likely a firmware "
- "bug on this device. Contact the card "
- "vendor for a firmware update.");
+ dev_printk(KERN_DEBUG, &dev->dev, "vpd r/w failed. This is likely a firmware bug on this device. Contact the card vendor for a firmware update\n");
return -ETIMEDOUT;
}
if (fatal_signal_pending(current))