]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
scsi: mptfusion: Fix printk continuations
authorHelge Deller <deller@gmx.de>
Thu, 17 Nov 2016 20:46:20 +0000 (21:46 +0100)
committerMartin K. Petersen <martin.petersen@oracle.com>
Fri, 18 Nov 2016 01:49:29 +0000 (20:49 -0500)
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 <deller@gmx.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/message/fusion/mptbase.c

index f82745c6cdf74f4ee515595054d49b1b2a79327a..1e73064b0fb2779b5bf14f39d842a8120ffccc04 100644 (file)
@@ -2865,21 +2865,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++;
        }
 
@@ -2888,12 +2888,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");
 }
 
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/