From patchwork Sat Apr 19 00:13:50 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Desfosses X-Patchwork-Id: 4019021 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id D09829F369 for ; Sat, 19 Apr 2014 00:15:45 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1DF8F20364 for ; Sat, 19 Apr 2014 00:15:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3D2672037A for ; Sat, 19 Apr 2014 00:15:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752913AbaDSAP2 (ORCPT ); Fri, 18 Apr 2014 20:15:28 -0400 Received: from relay4-d.mail.gandi.net ([217.70.183.196]:56833 "EHLO relay4-d.mail.gandi.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754639AbaDSAOm (ORCPT ); Fri, 18 Apr 2014 20:14:42 -0400 Received: from mfilter26-d.gandi.net (mfilter26-d.gandi.net [217.70.178.154]) by relay4-d.mail.gandi.net (Postfix) with ESMTP id 89C12172077; Sat, 19 Apr 2014 02:14:41 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mfilter26-d.gandi.net Received: from relay4-d.mail.gandi.net ([217.70.183.196]) by mfilter26-d.gandi.net (mfilter26-d.gandi.net [10.0.15.180]) (amavisd-new, port 10024) with ESMTP id 4pUdZyR3Q41A; Sat, 19 Apr 2014 02:14:39 +0200 (CEST) X-Originating-IP: 76.119.93.133 Received: from localhost.localdomain (c-76-119-93-133.hsd1.ct.comcast.net [76.119.93.133]) (Authenticated sender: ryan@desfo.org) by relay4-d.mail.gandi.net (Postfix) with ESMTPSA id 99B5E172074; Sat, 19 Apr 2014 02:14:38 +0200 (CEST) From: Ryan Desfosses To: bhelgaas@google.com Cc: trivial@kernel.org, linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, Ryan Desfosses Subject: [PATCH 5/8] msi: merged quoted strings Date: Fri, 18 Apr 2014 20:13:50 -0400 Message-Id: <1397866433-21119-6-git-send-email-ryan@desfo.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1397866433-21119-1-git-send-email-ryan@desfo.org> References: <1397866433-21119-1-git-send-email-ryan@desfo.org> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP change made to resolve following checkpatch message: WARNING: quoted string split across lines branch: Linux 3.15-rc1 Signed-off-by: Ryan Desfosses --- 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);