diff options
| author |   Borislav Petkov <bp@suse.de> | 2016-06-14 16:23:22 +0200 |
|---|---|---|
| committer |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-06-15 01:26:04 +0200 |
| commit | ca5f2b4c4fb7bb7397317ee2ead83485aa295a3e (patch) | |
| tree | 8c08c9bbea56cd80a1849d532a938b5e6eae673e | |
| parent | PM / Hibernate: Don't let kasan instrument snapshot.c (diff) | |
| download | linux-dev-ca5f2b4c4fb7bb7397317ee2ead83485aa295a3e.tar.xz linux-dev-ca5f2b4c4fb7bb7397317ee2ead83485aa295a3e.zip | |
PM / sleep: Make pm_prepare_console() return void
Nothing is using its return value so change it to return void.
No functionality change.
Signed-off-by: Borislav Petkov <bp@suse.de>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
| -rw-r--r-- | include/linux/suspend.h | 5 | ||||
| -rw-r--r-- | kernel/power/console.c | 8 |
2 files changed, 6 insertions, 7 deletions
diff --git a/include/linux/suspend.h b/include/linux/suspend.h index 8b6ec7ef0854..7693e39b14fe 100644 --- a/include/linux/suspend.h +++ b/include/linux/suspend.h @@ -18,12 +18,11 @@ static inline void pm_set_vt_switch(int do_switch) #endif #ifdef CONFIG_VT_CONSOLE_SLEEP -extern int pm_prepare_console(void); +extern void pm_prepare_console(void); extern void pm_restore_console(void); #else -static inline int pm_prepare_console(void) +static inline void pm_prepare_console(void) { - return 0; } static inline void pm_restore_console(void) diff --git a/kernel/power/console.c b/kernel/power/console.c index aba9c545a0e3..0e781798b0b3 100644 --- a/kernel/power/console.c +++ b/kernel/power/console.c @@ -126,17 +126,17 @@ out: return ret; } -int pm_prepare_console(void) +void pm_prepare_console(void) { if (!pm_vt_switch()) - return 0; + return; orig_fgconsole = vt_move_to_console(SUSPEND_CONSOLE, 1); if (orig_fgconsole < 0) - return 1; + return; orig_kmsg = vt_kmsg_redirect(SUSPEND_CONSOLE); - return 0; + return; } void pm_restore_console(void) |