GitHub-Mirror/linux-bl808
2
0
Fork 0
mirror of https://github.com/Fishwaldo/linux-bl808.git synced 2025-06-17 20:25:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

PM / sleep: Make pm_prepare_console() return void

Browse source 
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>
This commit is contained in:
Borislav Petkov 2016-06-14 16:23:22 +02:00 • committed by Rafael J. Wysocki
parent 6783091177
commit ca5f2b4c4f
2 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
include/linux/suspend.h
View file

@ -18,12 +18,11 @@ static inline void pm_set_vt_switch(int do_switch)
#endif #endif
#ifdef CONFIG_VT_CONSOLE_SLEEP #ifdef CONFIG_VT_CONSOLE_SLEEP
extern int pm_prepare_console(void); extern void pm_prepare_console(void);
extern void pm_restore_console(void); extern void pm_restore_console(void);
#else #else
static inline int pm_prepare_console(void) static inline void pm_prepare_console(void)
{ {
return 0;
} }
static inline void pm_restore_console(void) static inline void pm_restore_console(void)

8
kernel/power/console.c
View file

@ -126,17 +126,17 @@ out:
return ret; return ret;
} }
int pm_prepare_console(void) void pm_prepare_console(void)
{ {
if (!pm_vt_switch()) if (!pm_vt_switch())
return 0; return;
orig_fgconsole = vt_move_to_console(SUSPEND_CONSOLE, 1); orig_fgconsole = vt_move_to_console(SUSPEND_CONSOLE, 1);
if (orig_fgconsole < 0) if (orig_fgconsole < 0)
return 1; return;
orig_kmsg = vt_kmsg_redirect(SUSPEND_CONSOLE); orig_kmsg = vt_kmsg_redirect(SUSPEND_CONSOLE);
return 0; return;
} }
void pm_restore_console(void) void pm_restore_console(void)