[<prev] [next>] [day] [month] [year] [list]
Message-Id: <200811182114.29226.bzolnier@gmail.com>
Date: Tue, 18 Nov 2008 21:14:29 +0100
From: Bartlomiej Zolnierkiewicz <bzolnier@...il.com>
To: linux-ide@...r.kernel.org
Cc: linux-kernel@...r.kernel.org,
Michael Schmitz <schmitz@...phys.uni-duesseldorf.de>,
Geert Uytterhoeven <geert@...ux-m68k.org>,
Elias Oltmanns <eo@...ensachen.de>
Subject: [PATCH 1/3] ide: remove "paranoia" checks for hwgroup->busy
Remove "paranoia" checks for hwgroup->busy from ide_timer_expiry()
and ide_intr(). This is a preparation for future changes.
Cc: Michael Schmitz <schmitz@...phys.uni-duesseldorf.de>
Cc: Geert Uytterhoeven <geert@...ux-m68k.org>
Cc: Elias Oltmanns <eo@...ensachen.de>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@...il.com>
---
against current pata-2.6 tree (should also apply fine to linux-next)
drivers/ide/ide-io.c | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
Index: b/drivers/ide/ide-io.c
===================================================================
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -1018,10 +1018,7 @@ void ide_timer_expiry (unsigned long dat
} else {
ide_hwif_t *hwif;
ide_startstop_t startstop = ide_stopped;
- if (!hwgroup->busy) {
- hwgroup->busy = 1; /* paranoia */
- printk(KERN_ERR "%s: ide_timer_expiry: hwgroup->busy was 0 ??\n", drive->name);
- }
+
if ((expiry = hwgroup->expiry) != NULL) {
/* continue */
if ((wait = expiry(drive)) > 0) {
@@ -1234,10 +1231,6 @@ irqreturn_t ide_intr (int irq, void *dev
*/
goto out;
- if (!hwgroup->busy) {
- hwgroup->busy = 1; /* paranoia */
- printk(KERN_ERR "%s: ide_intr: hwgroup->busy was 0 ??\n", drive->name);
- }
hwgroup->handler = NULL;
hwgroup->req_gen++;
del_timer(&hwgroup->timer);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists