aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-01-02 10:12:49 -0500
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-01-02 10:12:49 -0500
commit2fb211502e2c0513e12d677ed4d7891f3c5e1413 (patch)
tree3d10026bb2d4eac897e96b1ff9c8c5bd12173954
parent295f00042aaf6b553b5f37348f89bab463d4a469 (diff)
ide: remove IDE PM hack from do_ide_request()
We now tell block layer that there is still work to do using blk_plug_device() so hack for IDE Power Management can be removed (it was buggy for hwgroups having more than 4 devices anyway). Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
-rw-r--r--drivers/ide/ide-io.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index 23754bc5e595..40327d1e6a9f 100644
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -786,7 +786,6 @@ void do_ide_request(struct request_queue *q)
786 ide_hwif_t *hwif; 786 ide_hwif_t *hwif;
787 struct request *rq; 787 struct request *rq;
788 ide_startstop_t startstop; 788 ide_startstop_t startstop;
789 int loops = 0;
790 789
791 /* caller must own hwgroup->lock */ 790 /* caller must own hwgroup->lock */
792 BUG_ON(!irqs_disabled()); 791 BUG_ON(!irqs_disabled());
@@ -844,7 +843,7 @@ void do_ide_request(struct request_queue *q)
844 843
845 if (drive != orig_drive) 844 if (drive != orig_drive)
846 goto plug_device; 845 goto plug_device;
847again: 846
848 hwif = drive->hwif; 847 hwif = drive->hwif;
849 848
850 if (hwif != hwgroup->hwif) { 849 if (hwif != hwgroup->hwif) {
@@ -882,16 +881,10 @@ again:
882 * though. I hope that doesn't happen too much, hopefully not 881 * though. I hope that doesn't happen too much, hopefully not
883 * unless the subdriver triggers such a thing in its own PM 882 * unless the subdriver triggers such a thing in its own PM
884 * state machine. 883 * state machine.
885 *
886 * We count how many times we loop here to make sure we service
887 * all drives in the hwgroup without looping for ever
888 */ 884 */
889 if ((drive->dev_flags & IDE_DFLAG_BLOCKED) && 885 if ((drive->dev_flags & IDE_DFLAG_BLOCKED) &&
890 blk_pm_request(rq) == 0 && 886 blk_pm_request(rq) == 0 &&
891 (rq->cmd_flags & REQ_PREEMPT) == 0) { 887 (rq->cmd_flags & REQ_PREEMPT) == 0) {
892 drive = drive->next ? drive->next : hwgroup->drive;
893 if (loops++ < 4 && !blk_queue_plugged(drive->queue))
894 goto again;
895 /* We clear busy, there should be no pending ATA command at this point. */ 888 /* We clear busy, there should be no pending ATA command at this point. */
896 hwgroup->busy = 0; 889 hwgroup->busy = 0;
897 goto plug_device; 890 goto plug_device;