diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-12-29 14:27:32 -0500 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-12-29 14:27:32 -0500 |
commit | 08cd1dca00f7c84c8b30c2726e078529d4ebc93f (patch) | |
tree | bb70eca7c7f690d2cd8184074fd11b5b103c7df7 /drivers/ide | |
parent | 2a2ca6a96194c4744a2adeefbc09ce881f3c5abe (diff) |
ide: cleanup ide_do_request()
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>
Diffstat (limited to 'drivers/ide')
-rw-r--r-- | drivers/ide/ide-io.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c index 72d0d702d5da..e41488e1ed4e 100644 --- a/drivers/ide/ide-io.c +++ b/drivers/ide/ide-io.c | |||
@@ -1016,11 +1016,6 @@ static void ide_do_request (ide_hwgroup_t *hwgroup, int masked_irq) | |||
1016 | drive->dev_flags &= ~(IDE_DFLAG_SLEEPING | IDE_DFLAG_PARKED); | 1016 | drive->dev_flags &= ~(IDE_DFLAG_SLEEPING | IDE_DFLAG_PARKED); |
1017 | drive->service_start = jiffies; | 1017 | drive->service_start = jiffies; |
1018 | 1018 | ||
1019 | if (blk_queue_plugged(drive->queue)) { | ||
1020 | printk(KERN_ERR "ide: huh? queue was plugged!\n"); | ||
1021 | break; | ||
1022 | } | ||
1023 | |||
1024 | /* | 1019 | /* |
1025 | * we know that the queue isn't empty, but this can happen | 1020 | * we know that the queue isn't empty, but this can happen |
1026 | * if the q->prep_rq_fn() decides to kill a request | 1021 | * if the q->prep_rq_fn() decides to kill a request |