UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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@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>
This commit is contained in:
Bartlomiej Zolnierkiewicz 2009-01-02 16:12:49 +01:00
parent 2fb211502e
commit b2cfb05a70
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/ide/ide-io.c
View File

@ -1011,10 +1011,7 @@ void ide_timer_expiry (unsigned long data)
} else { } else {
ide_hwif_t *hwif; ide_hwif_t *hwif;
ide_startstop_t startstop = ide_stopped; 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) { if ((expiry = hwgroup->expiry) != NULL) {
/* continue */ /* continue */
if ((wait = expiry(drive)) > 0) { if ((wait = expiry(drive)) > 0) {
@ -1227,10 +1224,6 @@ irqreturn_t ide_intr (int irq, void *dev_id)
*/ */
goto out; 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->handler = NULL;
hwgroup->req_gen++; hwgroup->req_gen++;
del_timer(&hwgroup->timer); del_timer(&hwgroup->timer);