diff options
| author | Pavel Machek <pavel@ucw.cz> | 2004-10-25 04:08:03 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-10-25 04:08:03 -0700 |
| commit | 13eea77b047c15a51e0d4b781120d044f0bd5b07 (patch) | |
| tree | 6cae63a591f0d782af9dce12d98efef6f825719b /kernel/power/disk.c | |
| parent | e0e74993a0a43bfc90dfdd375e1f9b8de00934c7 (diff) | |
[PATCH] power/disk.c: small fixups
power_down may never ever fail, so it does not really need to return
anything. Kill obsolete code and fixup old comments.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel/power/disk.c')
| -rw-r--r-- | kernel/power/disk.c | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/kernel/power/disk.c b/kernel/power/disk.c index 4cc81e03085c..4462b7f1c6aa 100644 --- a/kernel/power/disk.c +++ b/kernel/power/disk.c @@ -3,6 +3,7 @@ * * Copyright (c) 2003 Patrick Mochel * Copyright (c) 2003 Open Source Development Lab + * Copyright (c) 2004 Pavel Machek <pavel@suse.cz> * * This file is released under the GPLv2. * @@ -41,7 +42,7 @@ char resume_file[256] = CONFIG_PM_STD_PARTITION; * there ain't no turning back. */ -static int power_down(u32 mode) +static void power_down(u32 mode) { unsigned long flags; int error = 0; @@ -67,7 +68,6 @@ static int power_down(u32 mode) after resume. */ printk(KERN_CRIT "Please power me down manually\n"); while(1); - return 0; } @@ -162,7 +162,7 @@ static int prepare(void) * * If we're going through the firmware, then get it over with quickly. * - * If not, then call pmdis to do it's thing, then figure out how + * If not, then call swsusp to do it's thing, then figure out how * to power down the system. */ @@ -184,18 +184,9 @@ int pm_suspend_disk(void) if (in_suspend) { pr_debug("PM: writing image.\n"); - - /* - * FIXME: Leftover from swsusp. Are they necessary? - */ - mb(); - barrier(); - error = swsusp_write(); - if (!error) { - error = power_down(pm_disk_mode); - pr_debug("PM: Power down failed.\n"); - } + if (!error) + power_down(pm_disk_mode); } else pr_debug("PM: Image restored successfully.\n"); swsusp_free(); |