From: Pavel Machek 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 --- 25-akpm/kernel/power/disk.c | 19 +++++-------------- 1 files changed, 5 insertions(+), 14 deletions(-) diff -puN kernel/power/disk.c~power-diskc-small-fixups kernel/power/disk.c --- 25/kernel/power/disk.c~power-diskc-small-fixups Wed Oct 20 16:35:28 2004 +++ 25-akpm/kernel/power/disk.c Wed Oct 20 16:35:28 2004 @@ -3,6 +3,7 @@ * * Copyright (c) 2003 Patrick Mochel * Copyright (c) 2003 Open Source Development Lab + * Copyright (c) 2004 Pavel Machek * * This file is released under the GPLv2. * @@ -41,7 +42,7 @@ char resume_file[256] = CONFIG_PM_STD_PA * 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(); _