From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Mon, 29 Dec 2008 19:27:32 +0000 (+0100)
Subject: ide: cleanup ide_do_request()
X-Git-Tag: v2.6.29-rc1~561^2~21
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=08cd1dca00f7c84c8b30c2726e078529d4ebc93f;p=linux-2.6-omap-h63xx.git

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>
---

diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index 72d0d702d5d..e41488e1ed4 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)
 		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