diff options
| author | Ryan Desfosses <ryan@desfo.org> | 2014-04-18 20:13:50 -0400 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-06-10 22:20:42 -0400 |
| commit | 227f06470502c4fea3d93df1f12a77e3e37f6263 (patch) | |
| tree | 817a80fa89d17305a47a3e4e4012d36ae6cac36c /drivers/pci/access.c | |
| parent | 3c78bc61f5ef3bc87e7f94f67ec737d2273f120b (diff) | |
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.c | 5 |
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) | |||
| 231 | } | 231 | } |
| 232 | 232 | ||
| 233 | if (time_after(jiffies, timeout)) { | 233 | if (time_after(jiffies, timeout)) { |
| 234 | dev_printk(KERN_DEBUG, &dev->dev, | 234 | 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"); |
| 235 | "vpd r/w failed. This is likely a firmware " | ||
| 236 | "bug on this device. Contact the card " | ||
| 237 | "vendor for a firmware update."); | ||
| 238 | return -ETIMEDOUT; | 235 | return -ETIMEDOUT; |
| 239 | } | 236 | } |
| 240 | if (fatal_signal_pending(current)) | 237 | if (fatal_signal_pending(current)) |