aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-io.c
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-03-27 07:46:29 -0400
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-03-27 07:46:29 -0400
commit3616b6536a74ff1c56029c17cbb3575c69c0a574 (patch)
tree531feb15784ea6ae4871c712829ab23cbfb9bbc3 /drivers/ide/ide-io.c
parent19710d25d50ae0be05eebe4231ed8918b1092d82 (diff)
ide: complete power step in ide_complete_pm_request()
* Complete power step in ide_complete_pm_request(). * Rename ide_complete_pm_request() to ide_complete_pm_rq(). There should be no functional changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide-io.c')
-rw-r--r--drivers/ide/ide-io.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index 7007c48e27ae..49b098de367c 100644
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -178,11 +178,7 @@ void ide_end_drive_cmd (ide_drive_t *drive, u8 stat, u8 err)
178 kfree(task); 178 kfree(task);
179 } 179 }
180 } else if (blk_pm_request(rq)) { 180 } else if (blk_pm_request(rq)) {
181 struct request_pm_state *pm = rq->data; 181 ide_complete_pm_rq(drive, rq);
182
183 ide_complete_power_step(drive, rq);
184 if (pm->pm_step == IDE_PM_COMPLETED)
185 ide_complete_pm_request(drive, rq);
186 return; 182 return;
187 } 183 }
188 184
@@ -438,7 +434,7 @@ static ide_startstop_t start_request (ide_drive_t *drive, struct request *rq)
438 startstop = ide_start_power_step(drive, rq); 434 startstop = ide_start_power_step(drive, rq);
439 if (startstop == ide_stopped && 435 if (startstop == ide_stopped &&
440 pm->pm_step == IDE_PM_COMPLETED) 436 pm->pm_step == IDE_PM_COMPLETED)
441 ide_complete_pm_request(drive, rq); 437 ide_complete_pm_rq(drive, rq);
442 return startstop; 438 return startstop;
443 } else if (!rq->rq_disk && blk_special_request(rq)) 439 } else if (!rq->rq_disk && blk_special_request(rq))
444 /* 440 /*