[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1397866433-21119-6-git-send-email-ryan@desfo.org>
Date:	Fri, 18 Apr 2014 20:13:50 -0400
From:	Ryan Desfosses <ryan@...fo.org>
To:	bhelgaas@...gle.com
Cc:	trivial@...nel.org, linux-kernel@...r.kernel.org,
	linux-pci@...r.kernel.org, Ryan Desfosses <ryan@...fo.org>
Subject: [PATCH 5/8] msi: merged quoted strings
change made to resolve following checkpatch message:
  WARNING: quoted string split across lines
branch: Linux 3.15-rc1
Signed-off-by: Ryan Desfosses <ryan@...fo.org>
---
 drivers/pci/msi.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index 955ab79..31ae0bb 100644
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -917,8 +917,7 @@ int pci_enable_msi_block(struct pci_dev *dev, int nvec)
 
 	/* Check whether driver already requested MSI-X irqs */
 	if (dev->msix_enabled) {
-		dev_info(&dev->dev, "can't enable MSI "
-			 "(MSI-X already enabled)\n");
+		dev_info(&dev->dev, "can't enable MSI (MSI-X already enabled)\n");
 		return -EINVAL;
 	}
 
@@ -1029,8 +1028,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);
-- 
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/
Powered by blists - more mailing lists
 
