Kaynağa Gözat

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>
Bartlomiej Zolnierkiewicz 16 yıl önce
ebeveyn
işleme
b2cfb05a70
1 değiştirilmiş dosya ile 1 ekleme ve 8 silme
  1. 1 8
      drivers/ide/ide-io.c

+ 1 - 8
drivers/ide/ide-io.c

@@ -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);