scsi: qla1280: Fix printk regression
authorRené Rebe <rene@exactcode.com>
Thu, 10 Dec 2020 21:39:44 +0000 (22:39 +0100)
committerMartin K. Petersen <martin.petersen@oracle.com>
Sat, 23 Jan 2021 03:23:42 +0000 (22:23 -0500)
Since Linus Torvalds reinstated KERN_CONT in commit 4bcc595ccd80 ("printk:
reinstate KERN_CONT for printing continuation lines") in 2015, the qla1280
SCSI driver printed a rather ugly and screen real estate wasting multi-line
per device status glibberish during boot. Fix this by adding KERN_CONT as
needed.

Tested on my Sgi Octane: https://youtu.be/Lfqe1SYR2jk

Link: https://lore.kernel.org/r/20201210.223944.388095546873159172.rene@exactcode.com
Signed-off-by: René Rebe <rene@exactcode.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/qla1280.c

index 545936cb3980d6a19b1bc6ceb25a9d37ec37f92d..46de2541af259748f05cec1627a61ca30323c535 100644 (file)
@@ -3906,18 +3906,18 @@ qla1280_get_target_parameters(struct scsi_qla_host *ha,
        printk(KERN_INFO "scsi(%li:%d:%d:%d):", ha->host_no, bus, target, lun);
 
        if (mb[3] != 0) {
-               printk(" Sync: period %d, offset %d",
+               printk(KERN_CONT " Sync: period %d, offset %d",
                       (mb[3] & 0xff), (mb[3] >> 8));
                if (mb[2] & BIT_13)
-                       printk(", Wide");
+                       printk(KERN_CONT ", Wide");
                if ((mb[2] & BIT_5) && ((mb[6] >> 8) & 0xff) >= 2)
-                       printk(", DT");
+                       printk(KERN_CONT ", DT");
        } else
-               printk(" Async");
+               printk(KERN_CONT " Async");
 
        if (device->simple_tags)
-               printk(", Tagged queuing: depth %d", device->queue_depth);
-       printk("\n");
+               printk(KERN_CONT ", Tagged queuing: depth %d", device->queue_depth);
+       printk(KERN_CONT "\n");
 }