]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
ide: cleanup ide_do_request()
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Mon, 29 Dec 2008 19:27:32 +0000 (20:27 +0100)
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Mon, 29 Dec 2008 19:27:32 +0000 (20:27 +0100)
Both choose_drive() and PM handling code make sure that the queue
is unplugged so no need to check it again.

Cc: Elias Oltmanns <eo@nebensachen.de>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
drivers/ide/ide-io.c

index 72d0d702d5dace3e30ec53670d8fd23a730d0dc9..e41488e1ed4e6c1d9afb07f095d8460e36f7fe16 100644 (file)
@@ -1016,11 +1016,6 @@ static void ide_do_request (ide_hwgroup_t *hwgroup, int masked_irq)
                drive->dev_flags &= ~(IDE_DFLAG_SLEEPING | IDE_DFLAG_PARKED);
                drive->service_start = jiffies;
 
-               if (blk_queue_plugged(drive->queue)) {
-                       printk(KERN_ERR "ide: huh? queue was plugged!\n");
-                       break;
-               }
-
                /*
                 * we know that the queue isn't empty, but this can happen
                 * if the q->prep_rq_fn() decides to kill a request