From patchwork Thu Nov 17 20:46:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Helge Deller X-Patchwork-Id: 9435325 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A4B1A60755 for ; Thu, 17 Nov 2016 20:46:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 96157296D6 for ; Thu, 17 Nov 2016 20:46:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8A982296DB; Thu, 17 Nov 2016 20:46:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CF72A296D9 for ; Thu, 17 Nov 2016 20:46:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752125AbcKQUqe (ORCPT ); Thu, 17 Nov 2016 15:46:34 -0500 Received: from mout.gmx.net ([212.227.15.19]:62600 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752018AbcKQUqd (ORCPT ); Thu, 17 Nov 2016 15:46:33 -0500 Received: from p100.box ([92.203.6.216]) by mail.gmx.com (mrgmx003 [212.227.17.190]) with ESMTPSA (Nemesis) id 0MF4iR-1c0cke3LnX-00GH24; Thu, 17 Nov 2016 21:46:23 +0100 Date: Thu, 17 Nov 2016 21:46:20 +0100 From: Helge Deller To: linux-scsi@vger.kernel.org, James Bottomley Cc: linux-parisc@vger.kernel.org, John David Anglin Subject: [PATCH] mptfusion: Fix printk continuations Message-ID: <20161117204620.GA10093@p100.box> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) X-Provags-ID: V03:K0:MFms9SpbzHoBfXpyn3Zp7tQmj1rkrj2nkMoWH8QcFpRMILiXNXs fWpbCaMMcIdr19shEwY9wG97oJ+HDvo5y2n4kQ7KkcqqkCKteGj/Ut0iV2LQ/P9n+ZyO4jI ZHcfO62J7nDQteZIY3ZyVFSSSE4jA6F5XqYwR/+T65aUXcwtGHgNbDPPScpHeRs4OPjM5J9 ZUK7X16+HW1bzx+I1Jt4g== X-UI-Out-Filterresults: notjunk:1; V01:K0:H5OSONdA1pU=:BSQWUyEm1RkPiLR10knps1 5l55deoq8iPDytj5BpUBaj45xNNH+Vg6mWbifZMv3cUWPACEtVKUWpoaEc5ZJMnHznRV35k7h JATVmhts0Hcui5h8+MvGopzU/XizrpBerVPrxSfZiUEHqksVaBB//89+Pi/n0FHK4q21jDRG1 zV0TC2OHJpvSpWYy05MXjxoI8RtbAT4A8cZpEdbc4e5qZM42iqqlLrBtsM6c/sLy1/ZRsmUcR nkIpEqo+FvKeI1DXE1VstUI9LSto3NRG1mh3VPJj+oaMU6lBtzSnQbFP/XIoPZUhBJ1EV22q9 afy9I1gFLFwunrpaseZ3DkCkFF5kkrQ8WXut5B6/iwUu7rscUHbmB6cfi8q2iQKvFS5XKXxTV 92vyG1itm9C9PfhHoAuvyvWsTYG+La/3PZOcLq4VU4ECFNGpwo5KqxLRw4rfduTzpVRpfzjF0 Xut/eB62FY06C+OIplphR8+hQtOX+C6vsflZ10a6CfTtllMlo7ocuNZok7sMgVSDFDGnENT1I SmeP5bo45CEz/b3Pdm2AtrHsdOWe6PX/yqOq7TmvP466rRlxc04rUdMQbXBPFGmynNAy3MnPe XetCj3mzPRCQ1oIPPo/Wup5mYDvVds6LeJjotPpIIhN+INue++aTsLiJbNT4FADZZqkYsHs4y RYx+GnoWxY+ouahGIzxzLP84nXl7mBdYxzkHaGdCq1eSBV2FZmhmnCe2Ld5W6ZBrU4xfTtRR/ I4b9rGXVty2vnNuAUOfG41CqQ44jVNr4shJqHx3aJtkLyLOAr6+kol+bhTI= Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Fix the printk continuations when running the mptfusion driver. This patch brings the capabilities into one single syslog line again: mptbase: ioc1: Initiating bringup ioc1: LSI53C1030 B2: Capabilities={Initiator,Target} scsi host3: ioc1: LSI53C1030 B2, FwRev=01032341h, Ports=1, MaxQ=255, IRQ=67 Tested on a parisc C8000 machine. Signed-off-by: Helge Deller --- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c index 89c7ed1..fae96a2 100644 --- a/drivers/message/fusion/mptbase.c +++ b/drivers/message/fusion/mptbase.c @@ -2868,21 +2868,21 @@ MptDisplayIocCapabilities(MPT_ADAPTER *ioc) printk(KERN_INFO "%s: ", ioc->name); if (ioc->prod_name) - printk("%s: ", ioc->prod_name); - printk("Capabilities={"); + pr_cont("%s: ", ioc->prod_name); + pr_cont("Capabilities={"); if (ioc->pfacts[0].ProtocolFlags & MPI_PORTFACTS_PROTOCOL_INITIATOR) { - printk("Initiator"); + pr_cont("Initiator"); i++; } if (ioc->pfacts[0].ProtocolFlags & MPI_PORTFACTS_PROTOCOL_TARGET) { - printk("%sTarget", i ? "," : ""); + pr_cont("%sTarget", i ? "," : ""); i++; } if (ioc->pfacts[0].ProtocolFlags & MPI_PORTFACTS_PROTOCOL_LAN) { - printk("%sLAN", i ? "," : ""); + pr_cont("%sLAN", i ? "," : ""); i++; } @@ -2891,12 +2891,12 @@ MptDisplayIocCapabilities(MPT_ADAPTER *ioc) * This would probably evoke more questions than it's worth */ if (ioc->pfacts[0].ProtocolFlags & MPI_PORTFACTS_PROTOCOL_TARGET) { - printk("%sLogBusAddr", i ? "," : ""); + pr_cont("%sLogBusAddr", i ? "," : ""); i++; } #endif - printk("}\n"); + pr_cont("}\n"); } /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/