summaryrefslogtreecommitdiffstats
path: root/drivers/pci/msi.c
diff options
context:
space:
mode:
authorRyan Desfosses <ryan@desfo.org>2014-04-18 20:13:50 -0400
committerBjorn Helgaas <bhelgaas@google.com>2014-06-10 20:20:42 -0600
commit227f06470502c4fea3d93df1f12a77e3e37f6263 (patch)
tree817a80fa89d17305a47a3e4e4012d36ae6cac36c /drivers/pci/msi.c
parent3c78bc61f5ef3bc87e7f94f67ec737d2273f120b (diff)
downloadlinux-227f06470502c4fea3d93df1f12a77e3e37f6263.tar.bz2
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/msi.c')
-rw-r--r--drivers/pci/msi.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index 27a7e67ddfe4..5a68b485e547 100644
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -980,8 +980,7 @@ int pci_enable_msix(struct pci_dev *dev, struct msix_entry *entries, int nvec)
/* Check whether driver already requested for MSI irq */
if (dev->msi_enabled) {
- dev_info(&dev->dev, "can't enable MSI-X "
- "(MSI IRQ already assigned)\n");
+ dev_info(&dev->dev, "can't enable MSI-X (MSI IRQ already assigned)\n");
return -EINVAL;
}
status = msix_capability_init(dev, entries, nvec);