diff options
| author | Pavel Machek <pavel@ucw.cz> | 2005-01-14 23:25:21 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-01-14 23:25:21 -0800 |
| commit | 5f662298476a15871560729a1adbab8894580015 (patch) | |
| tree | 351678a7791e997ff70292ac0449bd2914a5fd42 /kernel | |
| parent | 0ba6102fd8f917c7ea3a8c330642826a9aa40b34 (diff) | |
| download | history-5f662298476a15871560729a1adbab8894580015.tar.gz | |
[PATCH] swsusp/dm: Use right levels for device_suspend()
This almost changes no code (constant is still "3"), but at least it uses
right constants for device_suspend() and fixes types at few points. Also
puts explanation of constants to the Documentation.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/power/disk.c | 6 | ||||
| -rw-r--r-- | kernel/power/main.c | 7 | ||||
| -rw-r--r-- | kernel/power/swsusp.c | 4 |
3 files changed, 10 insertions, 7 deletions
diff --git a/kernel/power/disk.c b/kernel/power/disk.c index e89e31f39be860..b9b3f588167796 100644 --- a/kernel/power/disk.c +++ b/kernel/power/disk.c @@ -51,7 +51,7 @@ static void power_down(suspend_disk_method_t mode) local_irq_save(flags); switch(mode) { case PM_DISK_PLATFORM: - device_power_down(PM_SUSPEND_DISK); + device_power_down(PMSG_SUSPEND); error = pm_ops->enter(PM_SUSPEND_DISK); break; case PM_DISK_SHUTDOWN: @@ -144,8 +144,10 @@ static int prepare(void) free_some_memory(); disable_nonboot_cpus(); - if ((error = device_suspend(PM_SUSPEND_DISK))) + if ((error = device_suspend(PMSG_FREEZE))) { + printk("Some devices failed to suspend\n"); goto Finish; + } return 0; Finish: diff --git a/kernel/power/main.c b/kernel/power/main.c index 14f910cc8750f0..b7ef95c9623093 100644 --- a/kernel/power/main.c +++ b/kernel/power/main.c @@ -65,7 +65,7 @@ static int suspend_prepare(suspend_state_t state) goto Thaw; } - if ((error = device_suspend(state))) + if ((error = device_suspend(PMSG_SUSPEND))) goto Finish; return 0; Finish: @@ -78,13 +78,14 @@ static int suspend_prepare(suspend_state_t state) } -static int suspend_enter(u32 state) +static int suspend_enter(suspend_state_t state) { int error = 0; unsigned long flags; local_irq_save(flags); - if ((error = device_power_down(state))) + + if ((error = device_power_down(PMSG_SUSPEND))) goto Done; error = pm_ops->enter(state); device_power_up(); diff --git a/kernel/power/swsusp.c b/kernel/power/swsusp.c index 28c55b0df64f30..22cdaa42d922dc 100644 --- a/kernel/power/swsusp.c +++ b/kernel/power/swsusp.c @@ -849,7 +849,7 @@ int swsusp_suspend(void) * become desynchronized with the actual state of the hardware * at resume time, and evil weirdness ensues. */ - if ((error = device_power_down(PM_SUSPEND_DISK))) { + if ((error = device_power_down(PMSG_FREEZE))) { local_irq_enable(); return error; } @@ -878,7 +878,7 @@ int swsusp_resume(void) { int error; local_irq_disable(); - device_power_down(PM_SUSPEND_DISK); + device_power_down(PMSG_FREEZE); /* We'll ignore saved state, but this gets preempt count (etc) right */ save_processor_state(); error = swsusp_arch_resume(); |