summaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide.c
diff options
context:
space:
mode:
authorJens Axboe <axboe@kernel.dk>2006-09-30 20:29:12 +0200
committerJens Axboe <axboe@kernel.dk>2006-09-30 20:29:12 +0200
commitc00895ab2f08df7044e58ee01c38bf0a661ea0eb (patch)
tree95dee4eb76042087c4b8d43a5841b6bae85b8cf3 /drivers/ide/ide.c
parent8a8e674cb1dafc818ffea93d97e4c1c1f01fdbb6 (diff)
downloadblackbird-op-linux-c00895ab2f08df7044e58ee01c38bf0a661ea0eb.tar.gz
blackbird-op-linux-c00895ab2f08df7044e58ee01c38bf0a661ea0eb.zip
[PATCH] Remove ->waiting member from struct request
As the comments indicates in blkdev.h, we can fold it into ->end_io_data usage as that is really what ->waiting is. Fixup the users of blk_end_sync_rq(). Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/ide/ide.c')
-rw-r--r--drivers/ide/ide.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index 9384a3fdde6c..2b1a1389c318 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -1219,7 +1219,7 @@ static int generic_ide_suspend(struct device *dev, pm_message_t mesg)
memset(&args, 0, sizeof(args));
rq.cmd_type = REQ_TYPE_PM_SUSPEND;
rq.special = &args;
- rq.end_io_data = &rqpm;
+ rq.data = &rqpm;
rqpm.pm_step = ide_pm_state_start_suspend;
if (mesg.event == PM_EVENT_PRETHAW)
mesg.event = PM_EVENT_FREEZE;
@@ -1240,7 +1240,7 @@ static int generic_ide_resume(struct device *dev)
memset(&args, 0, sizeof(args));
rq.cmd_type = REQ_TYPE_PM_RESUME;
rq.special = &args;
- rq.end_io_data = &rqpm;
+ rq.data = &rqpm;
rqpm.pm_step = ide_pm_state_start_resume;
rqpm.pm_state = PM_EVENT_ON;
OpenPOWER on IntegriCloud