From: Gunther Mayer <gunther.mayer@gmx.net>
To: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH-2.6.10] ide-lib printk readability fix
Date: Sat, 08 Jan 2005 16:48:21 -0800 [thread overview]
Message-ID: <41E07F55.8030803@gmx.net> (raw)
[-- Attachment #1: Type: text/plain, Size: 2373 bytes --]
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
--- linux-2.6.10/drivers/ide/ide-lib.c-orig 2004-12-24
13:35:39.000000000 -0800
+++ linux-2.6.10/drivers/ide/ide-lib.c 2005-01-08 16:04:35.977731896 -0800
@@ -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;
[-- Attachment #2: gmdiff-lx2610-ide-lib-error-readability-fix --]
[-- Type: text/plain, Size: 1297 bytes --]
--- linux-2.6.10/drivers/ide/ide-lib.c-orig 2004-12-24 13:35:39.000000000 -0800
+++ linux-2.6.10/drivers/ide/ide-lib.c 2005-01-08 16:04:35.977731896 -0800
@@ -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;
next reply other threads:[~2005-01-08 15:48 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-01-09 0:48 Gunther Mayer [this message]
2005-01-15 1:05 ` [PATCH-2.6.10] ide-lib printk readability fix Bartlomiej Zolnierkiewicz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=41E07F55.8030803@gmx.net \
--to=gunther.mayer@gmx.net \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox