Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1421949 > unrolled thread

[PATCH] PM: Make pm_prepare_console() return void

Back to article view | Back to linux.kernel

Contents

  [PATCH] PM: Make pm_prepare_console() return void Borislav Petkov <bp@alien8.de> - 2016-06-14 16:30 +0200
    Re: [PATCH] PM: Make pm_prepare_console() return void "Rafael J. Wysocki" <rjw@rjwysocki.net> - 2016-06-16 16:00 +0200

#1421949 — [PATCH] PM: Make pm_prepare_console() return void

From: Borislav Petkov <bp@suse.de>

Nothing is using its return value so change it to return void.

No functionality change.

Signed-off-by: Borislav Petkov <bp@suse.de>
---
 include/linux/suspend.h | 5 ++---
 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)
-- 
2.7.3

[toc] | [next] | [standalone]

#1424093

On Tuesday, June 14, 2016 04:23:22 PM Borislav Petkov wrote:
> From: Borislav Petkov <bp@suse.de>
> 
> Nothing is using its return value so change it to return void.
> 
> No functionality change.
> 
> Signed-off-by: Borislav Petkov <bp@suse.de>

Applied, thanks!

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web