ide-lib printk readability fix
Hi,
this improves logic and readability:
- remove blank from: AbortedCommand (as other flags)
- add blank and {} to error= line
- clean up: remove 2 lines and extra printk
before:
hdd: status error: status=0x7f { DriveReady DeviceFault SeekComplete
DataRequest CorrectedError Index Error }
hdd: status error: error=0x7fIllegalLengthIndication EndOfMedia
Aborted Command MediaChangeRequested LastFailedSense 0x07
after:
hdd: status error: status=0x7f { DriveReady DeviceFault SeekComplete
DataRequest CorrectedError Index Error }
hdd: status error: error=0x7f { IllegalLengthIndication EndOfMedia
AbortedCommand MediaChangeRequested LastFailedSense=0x07 }
Please apply.
-
Gunther
drivers/ide/ide-lib.c 2005-01-08 16:04:35.977731896 -0800 renamed from drivers/ide/ide-lib.c-orig 2004-12-24 13:35:39.000000000 -0800 +2 -4
@@ -462,8 +462,7 @@ status.all = stat; local_irq_set(flags); - printk("%s: %s: status=0x%02x", drive->name, msg, stat); - printk(" { "); + printk("%s: %s: status=0x%02x { ", drive->name, msg, stat); if (status.b.bsy) printk("Busy "); else {
@@ -475,18 +474,17 @@ if (status.b.idx) printk("Index "); if (status.b.check) printk("Error "); } - printk("}"); - printk("\n"); + printk("}\n"); if ((status.all & (status.b.bsy|status.b.check)) ==
status.b.check) {
error.all = HWIF(drive)->INB(IDE_ERROR_REG);
- printk("%s: %s: error=0x%02x", drive->name, msg, error.all);
+ printk("%s: %s: error=0x%02x { ", drive->name, msg, error.all);
if (error.b.ili) printk("IllegalLengthIndication ");
if (error.b.eom) printk("EndOfMedia ");
- if (error.b.abrt) printk("Aborted Command ");
+ if (error.b.abrt) printk("AbortedCommand ");
if (error.b.mcr) printk("MediaChangeRequested ");
- if (error.b.sense_key) printk("LastFailedSense 0x%02x ",
+ if (error.b.sense_key) printk("LastFailedSense=0x%02x ",
error.b.sense_key);
- printk("\n");
+ printk("}\n");
}
local_irq_restore(flags);
return error.all;drivers/ide/ide-lib.c renamed from drivers/ide/ide-lib.c-orig +6 -8
@@ -462,8 +462,7 @@ status.all = stat;local_irq_set (flags); -printk ("%s: %s: status=0x%02x" , drive->name, msg, stat); -printk (" { " ); +printk ("%s: %s: status=0x%02x { " , drive->name, msg, stat);if (status.b.bsy)printk ("Busy " );else {
@@ -475,18 +474,17 @@if (status.b.idx)printk ("Index " );if (status.b.check)printk ("Error " ); } -printk ("}" ); -printk ("\n" ); +printk ("}\n" );if ((status.all & (status.b.bsy|status.b.check)) == status.b.check) { error.all =HWIF (drive)->INB (IDE_ERROR_REG ); -printk ("%s: %s: error=0x%02x" , drive->name, msg, error.all); +printk ("%s: %s: error=0x%02x { " , drive->name, msg, error.all);if (error.b.ili)printk ("IllegalLengthIndication " );if (error.b.eom)printk ("EndOfMedia " ); -if (error.b.abrt)printk ("Aborted Command " ); +if (error.b.abrt)printk ("AbortedCommand " );if (error.b.mcr)printk ("MediaChangeRequested " ); -if (error.b.sense_key)printk ("LastFailedSense 0x%02x " , +if (error.b.sense_key)printk ("LastFailedSense=0x%02x " , error.b.sense_key); -printk ("\n" ); +printk ("}\n" ); }local_irq_restore (flags);return error.all;
Bartlomiej Zolnierkiewicz
AppliedQuoted 12 lines · Gunther Mayer
Hi,
this improves logic and readability:
- remove blank from: AbortedCommand (as other flags)
- add blank and {} to error= line
- clean up: remove 2 lines and extra printkbefore:
hdd: status error: status=0x7f { DriveReady DeviceFault SeekComplete
DataRequest CorrectedError Index Error }
hdd: status error: error=0x7fIllegalLengthIndication EndOfMedia
Aborted Command MediaChangeRequested LastFailedSense0x07
Quoted 7 lines
after:
hdd: status error: status=0x7f { DriveReady DeviceFault SeekComplete
DataRequest CorrectedError Index Error }
hdd: status error: error=0x7f { IllegalLengthIndication EndOfMedia
AbortedCommand MediaChangeRequested LastFailedSense=0x07 }Please apply.
applied