summaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-io.c
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2009-04-19 00:00:43 +0200
committerJens Axboe <jens.axboe@oracle.com>2009-04-28 07:37:30 +0200
commit765139ef5f1a4b1d5cb1f1a7a12de7ee61f6500f (patch)
treecced409300ad193c7a3d9203441834c629cfcb7e /drivers/ide/ide-io.c
parentide-cd,atapi: use bio for internal commands (diff)
downloadlinux-765139ef5f1a4b1d5cb1f1a7a12de7ee61f6500f.tar.xz
linux-765139ef5f1a4b1d5cb1f1a7a12de7ee61f6500f.zip
ide-pm: don't abuse rq->data
Impact: cleanup rq->data usage ide-pm uses rq->data to carry pointer to struct request_pm_state through request queue and rq->special is used to carray pointer to local struct ide_cmd, which isn't necessary. Use rq->special for request_pm_state instead and use local ide_cmd in ide_start_power_step(). Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/ide/ide-io.c')
-rw-r--r--drivers/ide/ide-io.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index 3245c2dbda33..6e3094e22775 100644
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -368,7 +368,7 @@ static ide_startstop_t start_request (ide_drive_t *drive, struct request *rq)
if (rq->cmd_type == REQ_TYPE_ATA_TASKFILE)
return execute_drive_cmd(drive, rq);
else if (blk_pm_request(rq)) {
- struct request_pm_state *pm = rq->data;
+ struct request_pm_state *pm = rq->special;
#ifdef DEBUG_PM
printk("%s: start_power_step(step: %d)\n",
drive->name, pm->pm_step);