Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4aaa4065 authored by Helge Deller's avatar Helge Deller Committed by Martin K. Petersen
Browse files

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: default avatarHelge Deller <deller@gmx.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 0910d8bb

drivers/message/fusion/mptbase.c

+7 −7
Original line number Diff line number Diff line
@@ -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");

}



/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/