Messages in this thread Patch in this message | | | Date | Wed, 20 Oct 2004 20:16:17 +0200 | From | Pavel Machek <> | Subject | power/disk.c: small fixups |
| |
Hi!
power_down may never ever fail, so it does not really need to return anything. Kill obsolete code and fixup old comments. Please apply,
Pavel
--- foo/kernel/power/disk.c 19 Oct 2004 05:52:31 -0000 1.8 +++ foo/kernel/power/disk.c 20 Oct 2004 17:53:42 -0000 @@ -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 +43,7 @@ * 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 +69,6 @@ after resume. */ printk(KERN_CRIT "Please power me down manually\n"); while(1); - return 0; } @@ -162,7 +163,7 @@ * * 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 +185,9 @@ 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(); -- People were complaining that M$ turns users into beta-testers... ...jr ghea gurz vagb qrirybcref, naq gurl frrz gb yvxr vg gung jnl! - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |