aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/message/fusion
diff options
context:
space:
mode:
authorHelge Deller <deller@gmx.de>2016-11-17 15:46:20 -0500
committerMartin K. Petersen <martin.petersen@oracle.com>2016-11-17 20:49:29 -0500
commit4aaa4065f762514c38aba1f1193d200c7140d1c0 (patch)
tree8b91124ff883011fc800e2402c77d2bb869b9e9d /drivers/message/fusion
parent0910d8bbdd99856af1394d3d8830955abdefee4a (diff)
scsi: mptfusion: Fix printk continuations
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>
Diffstat (limited to 'drivers/message/fusion')
-rw-r--r--drivers/message/fusion/mptbase.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
index f82745c6cdf7..1e73064b0fb2 100644
--- a/drivers/message/fusion/mptbase.c
+++ b/drivers/message/fusion/mptbase.c
@@ -2865,21 +2865,21 @@ MptDisplayIocCapabilities(MPT_ADAPTER *ioc)
2865 2865
2866 printk(KERN_INFO "%s: ", ioc->name); 2866 printk(KERN_INFO "%s: ", ioc->name);
2867 if (ioc->prod_name) 2867 if (ioc->prod_name)
2868 printk("%s: ", ioc->prod_name); 2868 pr_cont("%s: ", ioc->prod_name);
2869 printk("Capabilities={"); 2869 pr_cont("Capabilities={");
2870 2870
2871 if (ioc->pfacts[0].ProtocolFlags & MPI_PORTFACTS_PROTOCOL_INITIATOR) { 2871 if (ioc->pfacts[0].ProtocolFlags & MPI_PORTFACTS_PROTOCOL_INITIATOR) {
2872 printk("Initiator"); 2872 pr_cont("Initiator");
2873 i++; 2873 i++;
2874 } 2874 }
2875 2875
2876 if (ioc->pfacts[0].ProtocolFlags & MPI_PORTFACTS_PROTOCOL_TARGET) { 2876 if (ioc->pfacts[0].ProtocolFlags & MPI_PORTFACTS_PROTOCOL_TARGET) {
2877 printk("%sTarget", i ? "," : ""); 2877 pr_cont("%sTarget", i ? "," : "");
2878 i++; 2878 i++;
2879 } 2879 }
2880 2880
2881 if (ioc->pfacts[0].ProtocolFlags & MPI_PORTFACTS_PROTOCOL_LAN) { 2881 if (ioc->pfacts[0].ProtocolFlags & MPI_PORTFACTS_PROTOCOL_LAN) {
2882 printk("%sLAN", i ? "," : ""); 2882 pr_cont("%sLAN", i ? "," : "");
2883 i++; 2883 i++;
2884 } 2884 }
2885 2885
@@ -2888,12 +2888,12 @@ MptDisplayIocCapabilities(MPT_ADAPTER *ioc)
2888 * This would probably evoke more questions than it's worth 2888 * This would probably evoke more questions than it's worth
2889 */ 2889 */
2890 if (ioc->pfacts[0].ProtocolFlags & MPI_PORTFACTS_PROTOCOL_TARGET) { 2890 if (ioc->pfacts[0].ProtocolFlags & MPI_PORTFACTS_PROTOCOL_TARGET) {
2891 printk("%sLogBusAddr", i ? "," : ""); 2891 pr_cont("%sLogBusAddr", i ? "," : "");
2892 i++; 2892 i++;
2893 } 2893 }
2894#endif 2894#endif
2895 2895
2896 printk("}\n"); 2896 pr_cont("}\n");
2897} 2897}
2898 2898
2899/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ 2899/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/