aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBorislav Petkov <bp@suse.de>2016-06-14 10:23:22 -0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-06-14 19:26:04 -0400
commitca5f2b4c4fb7bb7397317ee2ead83485aa295a3e (patch)
tree8c08c9bbea56cd80a1849d532a938b5e6eae673e
parent678309117768e25751594a48a2d873b0552a3130 (diff)
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.h5
-rw-r--r--kernel/power/console.c8
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)
18#endif 18#endif
19 19
20#ifdef CONFIG_VT_CONSOLE_SLEEP 20#ifdef CONFIG_VT_CONSOLE_SLEEP
21extern int pm_prepare_console(void); 21extern void pm_prepare_console(void);
22extern void pm_restore_console(void); 22extern void pm_restore_console(void);
23#else 23#else
24static inline int pm_prepare_console(void) 24static inline void pm_prepare_console(void)
25{ 25{
26 return 0;
27} 26}
28 27
29static inline void pm_restore_console(void) 28static 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:
126 return ret; 126 return ret;
127} 127}
128 128
129int pm_prepare_console(void) 129void pm_prepare_console(void)
130{ 130{
131 if (!pm_vt_switch()) 131 if (!pm_vt_switch())
132 return 0; 132 return;
133 133
134 orig_fgconsole = vt_move_to_console(SUSPEND_CONSOLE, 1); 134 orig_fgconsole = vt_move_to_console(SUSPEND_CONSOLE, 1);
135 if (orig_fgconsole < 0) 135 if (orig_fgconsole < 0)
136 return 1; 136 return;
137 137
138 orig_kmsg = vt_kmsg_redirect(SUSPEND_CONSOLE); 138 orig_kmsg = vt_kmsg_redirect(SUSPEND_CONSOLE);
139 return 0; 139 return;
140} 140}
141 141
142void pm_restore_console(void) 142void pm_restore_console(void)