Commit 6ef56325 authored by Joe Perches's avatar Joe Perches Committed by Tejun Heo

libata: Convert bare printks to pr_cont

Linus Torvalds changed the behavior of printks without KERN_<LEVEL>.

Convert the continuation prints to use pr_cont.

At the same time, convert the existing printks with KERN_<LEVEL> to
pr_<level>

Miscellanea:

o Coalesce a multiline format
Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent 08fc4756
...@@ -903,32 +903,32 @@ static void ata_dump_status(unsigned id, struct ata_taskfile *tf) ...@@ -903,32 +903,32 @@ static void ata_dump_status(unsigned id, struct ata_taskfile *tf)
{ {
u8 stat = tf->command, err = tf->feature; u8 stat = tf->command, err = tf->feature;
printk(KERN_WARNING "ata%u: status=0x%02x { ", id, stat); pr_warn("ata%u: status=0x%02x { ", id, stat);
if (stat & ATA_BUSY) { if (stat & ATA_BUSY) {
printk("Busy }\n"); /* Data is not valid in this case */ pr_cont("Busy }\n"); /* Data is not valid in this case */
} else { } else {
if (stat & ATA_DRDY) printk("DriveReady "); if (stat & ATA_DRDY) pr_cont("DriveReady ");
if (stat & ATA_DF) printk("DeviceFault "); if (stat & ATA_DF) pr_cont("DeviceFault ");
if (stat & ATA_DSC) printk("SeekComplete "); if (stat & ATA_DSC) pr_cont("SeekComplete ");
if (stat & ATA_DRQ) printk("DataRequest "); if (stat & ATA_DRQ) pr_cont("DataRequest ");
if (stat & ATA_CORR) printk("CorrectedError "); if (stat & ATA_CORR) pr_cont("CorrectedError ");
if (stat & ATA_SENSE) printk("Sense "); if (stat & ATA_SENSE) pr_cont("Sense ");
if (stat & ATA_ERR) printk("Error "); if (stat & ATA_ERR) pr_cont("Error ");
printk("}\n"); pr_cont("}\n");
if (err) { if (err) {
printk(KERN_WARNING "ata%u: error=0x%02x { ", id, err); pr_warn("ata%u: error=0x%02x { ", id, err);
if (err & ATA_ABORTED) printk("DriveStatusError "); if (err & ATA_ABORTED) pr_cont("DriveStatusError ");
if (err & ATA_ICRC) { if (err & ATA_ICRC) {
if (err & ATA_ABORTED) if (err & ATA_ABORTED)
printk("BadCRC "); pr_cont("BadCRC ");
else printk("Sector "); else pr_cont("Sector ");
} }
if (err & ATA_UNC) printk("UncorrectableError "); if (err & ATA_UNC) pr_cont("UncorrectableError ");
if (err & ATA_IDNF) printk("SectorIdNotFound "); if (err & ATA_IDNF) pr_cont("SectorIdNotFound ");
if (err & ATA_TRK0NF) printk("TrackZeroNotFound "); if (err & ATA_TRK0NF) pr_cont("TrackZeroNotFound ");
if (err & ATA_AMNF) printk("AddrMarkNotFound "); if (err & ATA_AMNF) pr_cont("AddrMarkNotFound ");
printk("}\n"); pr_cont("}\n");
} }
} }
} }
...@@ -1059,8 +1059,7 @@ static void ata_to_sense_error(unsigned id, u8 drv_stat, u8 drv_err, u8 *sk, ...@@ -1059,8 +1059,7 @@ static void ata_to_sense_error(unsigned id, u8 drv_stat, u8 drv_err, u8 *sk,
translate_done: translate_done:
if (verbose) if (verbose)
printk(KERN_ERR "ata%u: translated ATA stat/err 0x%02x/%02x " pr_err("ata%u: translated ATA stat/err 0x%02x/%02x to SCSI SK/ASC/ASCQ 0x%x/%02x/%02x\n",
"to SCSI SK/ASC/ASCQ 0x%x/%02x/%02x\n",
id, drv_stat, drv_err, *sk, *asc, *ascq); id, drv_stat, drv_err, *sk, *asc, *ascq);
return; return;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment