aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide.c
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-10-13 15:39:38 -0400
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-10-13 15:39:38 -0400
commit0d346ba0730d84f04022f9f984d3f606f69cef37 (patch)
tree0e68c29e5cbea6766cded4feb9274d87698f8b72 /drivers/ide/ide.c
parentd1d76714e2f0c520b6c2a84ab5b050d0b3244949 (diff)
ide: sanitize ide*_pm_* enums
* Move ide*_pm_* enums from ide-io.c to <linux/ide.h>. * idedisk_pm_* -> ide_pm_* * ide_pm_state_* -> ide_pm_* * No need to set ide_pm_* enums to the fixed values. * Uppercase ide_pm_* enums. * Fix/update comments. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
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 78776bbb537..40b5a461434 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -388,7 +388,7 @@ static int generic_ide_suspend(struct device *dev, pm_message_t mesg)
388 rq->cmd_type = REQ_TYPE_PM_SUSPEND; 388 rq->cmd_type = REQ_TYPE_PM_SUSPEND;
389 rq->special = &args; 389 rq->special = &args;
390 rq->data = &rqpm; 390 rq->data = &rqpm;
391 rqpm.pm_step = ide_pm_state_start_suspend; 391 rqpm.pm_step = IDE_PM_START_SUSPEND;
392 if (mesg.event == PM_EVENT_PRETHAW) 392 if (mesg.event == PM_EVENT_PRETHAW)
393 mesg.event = PM_EVENT_FREEZE; 393 mesg.event = PM_EVENT_FREEZE;
394 rqpm.pm_state = mesg.event; 394 rqpm.pm_state = mesg.event;
@@ -427,7 +427,7 @@ static int generic_ide_resume(struct device *dev)
427 rq->cmd_flags |= REQ_PREEMPT; 427 rq->cmd_flags |= REQ_PREEMPT;
428 rq->special = &args; 428 rq->special = &args;
429 rq->data = &rqpm; 429 rq->data = &rqpm;
430 rqpm.pm_step = ide_pm_state_start_resume; 430 rqpm.pm_step = IDE_PM_START_RESUME;
431 rqpm.pm_state = PM_EVENT_ON; 431 rqpm.pm_state = PM_EVENT_ON;
432 432
433 err = blk_execute_rq(drive->queue, NULL, rq, 1); 433 err = blk_execute_rq(drive->queue, NULL, rq, 1);