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/msi.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/msi.c')
-rw-r--r-- | drivers/pci/msi.c | 3 |
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) | |||
980 | 980 | ||
981 | /* Check whether driver already requested for MSI irq */ | 981 | /* Check whether driver already requested for MSI irq */ |
982 | if (dev->msi_enabled) { | 982 | if (dev->msi_enabled) { |
983 | dev_info(&dev->dev, "can't enable MSI-X " | 983 | dev_info(&dev->dev, "can't enable MSI-X (MSI IRQ already assigned)\n"); |
984 | "(MSI IRQ already assigned)\n"); | ||
985 | return -EINVAL; | 984 | return -EINVAL; |
986 | } | 985 | } |
987 | status = msix_capability_init(dev, entries, nvec); | 986 | status = msix_capability_init(dev, entries, nvec); |