aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide.c
diff options
context:
space:
mode:
authorJens Axboe <axboe@suse.de>2006-06-13 02:46:57 -0400
committerJens Axboe <axboe@nelson.home.kernel.dk>2006-06-23 11:10:39 -0400
commitad3caddaa1708e506f20b8e25a4a8ae586fc7d5b (patch)
tree60a79c55a71ed3ef7bc9daaea694995b034eb044 /drivers/ide/ide.c
parentb31dc66a54ad986b6b73bdc49c8efc17cbad1833 (diff)
[PATCH] Get rid of struct request request_pm_state member
The IDE power management can just use the ->end_io_data member to store it's data. Signed-off-by: Jens Axboe <axboe@suse.de>
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 9799aed772e1..59fe358048b3 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -1226,7 +1226,7 @@ static int generic_ide_suspend(struct device *dev, pm_message_t state)
1226 memset(&args, 0, sizeof(args)); 1226 memset(&args, 0, sizeof(args));
1227 rq.flags = REQ_PM_SUSPEND; 1227 rq.flags = REQ_PM_SUSPEND;
1228 rq.special = &args; 1228 rq.special = &args;
1229 rq.pm = &rqpm; 1229 rq.end_io_data = &rqpm;
1230 rqpm.pm_step = ide_pm_state_start_suspend; 1230 rqpm.pm_step = ide_pm_state_start_suspend;
1231 rqpm.pm_state = state.event; 1231 rqpm.pm_state = state.event;
1232 1232
@@ -1245,7 +1245,7 @@ static int generic_ide_resume(struct device *dev)
1245 memset(&args, 0, sizeof(args)); 1245 memset(&args, 0, sizeof(args));
1246 rq.flags = REQ_PM_RESUME; 1246 rq.flags = REQ_PM_RESUME;
1247 rq.special = &args; 1247 rq.special = &args;
1248 rq.pm = &rqpm; 1248 rq.end_io_data = &rqpm;
1249 rqpm.pm_step = ide_pm_state_start_resume; 1249 rqpm.pm_step = ide_pm_state_start_resume;
1250 rqpm.pm_state = PM_EVENT_ON; 1250 rqpm.pm_state = PM_EVENT_ON;
1251 1251