From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758205AbdEOMam (ORCPT ); Mon, 15 May 2017 08:30:42 -0400 Received: from mout.web.de ([212.227.15.3]:52741 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752352AbdEOMak (ORCPT ); Mon, 15 May 2017 08:30:40 -0400 Subject: [PATCH 4/4] pcmcia: pd6729: Combine substrings for six messages From: SF Markus Elfring To: linux-pcmcia@lists.infradead.org Cc: LKML , kernel-janitors@vger.kernel.org References: <07cd817c-3045-72d8-34e2-e81b73efc291@users.sourceforge.net> Message-ID: Date: Mon, 15 May 2017 14:30:08 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.1.1 MIME-Version: 1.0 In-Reply-To: <07cd817c-3045-72d8-34e2-e81b73efc291@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K0:t6YmpnipsRmMxQUY+h/ZaaeNOH5Ba9fM7jqM8di6q0HZpr+fiDz IkvUguRoRX1T/1LBxg0L/WMdWWVfq++WnhXKks1KPBWh7p9f79zJ1NzCBBhDe+2OM8YMJfx wjaVtn/ounokzu5vkcw4UQopY6vCo+xQemXIgyLnD1t2Im5s7WdD1bCXn4P9B4CnbMYlZuQ ooPOmhsXzryLOsC+CC+vQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:8sqnujXomTQ=:VFtpHg3CeUtSOr45crGeNt 2aSjkCpWncPrjh9Cb8PtLFEMEjW7lJeZoLdGBqtCCLzwib7AK/Sa8BURHyYf3WALKBOaNvmQt eSxQS8UhwkBslstNkwUzH88VdaBudcd/0Fx/rGEVJV+svJ69zqEZk4+AQDVOrpLwu10dTvYXJ A25iT9q8n0xx6BpPsiOcQfwO904qu06theJetUpBUqDrPQoAgatbFUZSd9LQssAQmfe003St6 wpIMZkyp1KdK21eOvjO0UBvpQe2BE2V8tI3mqcOE7Tg+dYS17pGUeUunmpFIpOwm4rOEFinWs 5V7HUXf+947JE+5kDgLR++k1Vyl+6ZXO0apcCeKIw70w28Y5WJrPzCVhYRw9w3KYPlpqUm6kh vnKwNWRpCJQKvWGCSUW1zg4irsZ2vochHbf9VIy6f5dwuTMuavcSG2lH6SZLOSbHOIkA5e1lK fX7UGqVGipyzhe8YvVKwOMxpjWQUYkg0M/wkwaZ+u6Hww5pd3Y3UJ9Yn+gANPrzrv3g1qb54G tr9ZPU+0Oe0iPcZ7bliIasivhiyR37jWwnT+6/axzxgswSfuMeDLDQM932vGU54Z71C52pChc uKOfS//+HVKy7Dbva9dZsErmPQaC9b/VOtSgcnKUutWmQRefZ/2I0Zzeq/VlDZRFhakkWcsfM EP7l6mK/y3AxGsmvG4D9fxMKPTMmPsvfKmAAs0u2izoORhd5y+W6nz2I/Vvef4mHConad6sSi 192g11Ruwl6Sei+KAw5/Gwan1nPjVERm/PUoEWxYaRT9964Mn7cdzxG3kowSJSQ+l8/0/dyKK 9lAQZfB Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Mon, 15 May 2017 13:50:52 +0200 The script "checkpatch.pl" pointed information out like the following. WARNING: quoted string split across lines Thus fix the affected source code places. Prefer usage of the macros "pr_err" and "pr_info" over the interface "printk". Signed-off-by: Markus Elfring --- drivers/pcmcia/pd6729.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/drivers/pcmcia/pd6729.c b/drivers/pcmcia/pd6729.c index b3422119820a..841f413c0d03 100644 --- a/drivers/pcmcia/pd6729.c +++ b/drivers/pcmcia/pd6729.c @@ -183,8 +183,7 @@ static irqreturn_t pd6729_interrupt(int irq, void *dev) while (1) { loopcount++; if (loopcount > 20) { - printk(KERN_ERR "pd6729: infinite eventloop " - "in interrupt\n"); + pr_err("infinite event loop in interrupt\n"); break; } @@ -348,8 +347,8 @@ static int pd6729_set_socket(struct pcmcia_socket *sock, socket_state_t *state) break; default: dev_dbg(&sock->dev, - "pd6729_set_socket called with invalid VCC power " - "value: %i\n", state->Vcc); + "%s called with invalid VCC power value: %i\n", + __func__, state->Vcc); return -EINVAL; } @@ -369,8 +368,9 @@ static int pd6729_set_socket(struct pcmcia_socket *sock, socket_state_t *state) reg |= I365_VPP1_12V; break; default: - dev_dbg(&sock->dev, "pd6729: pd6729_set_socket called with " - "invalid VPP power value: %i\n", state->Vpp); + dev_dbg(&sock->dev, + "%s called with invalid VPP power value: %i\n", + __func__, state->Vpp); return -EINVAL; } @@ -597,8 +597,7 @@ static u_int pd6729_isa_scan(void) int i; if (irq_mode == 1) { - printk(KERN_INFO "pd6729: PCI card interrupts, " - "PCI status changes\n"); + pr_info("PCI card interrupts, PCI status changes\n"); return 0; } @@ -641,15 +640,15 @@ static int pd6729_pci_probe(struct pci_dev *dev, } if (!pci_resource_start(dev, 0)) { - dev_warn(&dev->dev, "refusing to load the driver as the " - "io_base is NULL.\n"); + dev_warn(&dev->dev, + "refusing to load the driver as the io_base is NULL.\n"); ret = -ENOMEM; goto err_out_disable; } - dev_info(&dev->dev, "Cirrus PD6729 PCI to PCMCIA Bridge at 0x%llx " - "on irq %d\n", - (unsigned long long)pci_resource_start(dev, 0), dev->irq); + dev_info(&dev->dev, + "Cirrus PD6729 PCI to PCMCIA Bridge at 0x%llx on irq %d\n", + (unsigned long long)pci_resource_start(dev, 0), dev->irq); /* * Since we have no memory BARs some firmware may not * have had PCI_COMMAND_MEMORY enabled, yet the device needs it. -- 2.13.0