Messages in this thread Patch in this message | | | Date | Sun, 10 Aug 2003 22:21:30 +0200 | From | Pavel Machek <> | Subject | [PM] Small cleanups |
| |
Hi!
Few small cleanups, please apply. Pavel
--- /usr/src/tmp/linux/kernel/power/console.c 2003-08-10 21:23:36.000000000 +0200 +++ /usr/src/linux/kernel/power/console.c 2003-08-10 22:07:12.000000000 +0200 @@ -1,3 +1,9 @@ +/* + * drivers/power/process.c - Functions for saving/restoring console. + * + * Originally from swsusp. + */ + #include <linux/vt_kern.h> #include <linux/kbd_kern.h> #include "power.h" @@ -14,13 +20,13 @@ #ifdef SUSPEND_CONSOLE orig_fgconsole = fg_console; - if(vc_allocate(SUSPEND_CONSOLE)) + if (vc_allocate(SUSPEND_CONSOLE)) /* we can't have a free VC for now. Too bad, * we don't want to mess the screen for now. */ return 1; - set_console (SUSPEND_CONSOLE); - if(vt_waitactive(SUSPEND_CONSOLE)) { + set_console(SUSPEND_CONSOLE); + if (vt_waitactive(SUSPEND_CONSOLE)) { pr_debug("Suspend: Can't switch VCs."); return 1; } @@ -34,7 +40,7 @@ { console_loglevel = orig_loglevel; #ifdef SUSPEND_CONSOLE - set_console (orig_fgconsole); + set_console(orig_fgconsole); #endif return; } --- /usr/src/tmp/linux/kernel/power/swsusp.c 2003-08-10 21:23:36.000000000 +0200 +++ /usr/src/linux/kernel/power/swsusp.c 2003-08-10 22:08:09.000000000 +0200 @@ -504,7 +508,7 @@ device_resume(RESUME_ENABLE); } if (flags & RESUME_PHASE2) { - if(pm_suspend_state) { + if (pm_suspend_state) { if(pm_send_all(PM_RESUME,(void *)0)) printk(KERN_WARNING "Problem while sending resume event\n"); pm_suspend_state=0; @@ -715,7 +719,7 @@ blk_run_queues(); /* Save state of all device drivers, and stop them. */ - if(drivers_suspend()==0) + if (drivers_suspend()==0) /* If stopping device drivers worked, we proceed basically into * suspend_save_image. * -- When do you have a heart between your knees? [Johanka's followup: and *two* hearts?] - 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/
| |