Skip to content

Commit

Permalink
ide: remove "paranoia" checks for hwgroup->busy
Browse files Browse the repository at this point in the history
Remove "paranoia" checks for hwgroup->busy from ide_timer_expiry()
and ide_intr().  This is a preparation for future changes.

Cc: Michael Schmitz <schmitz@biophys.uni-duesseldorf.de>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Elias Oltmanns <eo@nebensachen.de>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
  • Loading branch information
Bartlomiej Zolnierkiewicz committed Jan 2, 2009
1 parent 2fb2115 commit b2cfb05
Showing 1 changed file with 1 addition and 8 deletions.
9 changes: 1 addition & 8 deletions drivers/ide/ide-io.c
Original file line number Diff line number Diff line change
Expand Up @@ -1011,10 +1011,7 @@ void ide_timer_expiry (unsigned long data)
} 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) {
Expand Down Expand Up @@ -1227,10 +1224,6 @@ irqreturn_t ide_intr (int irq, void *dev_id)
*/
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);
Expand Down

0 comments on commit b2cfb05

Please sign in to comment.