[v2,1/3] printk: fix name/type/scope of preferred_console var

Message ID 20170302131153.22733-2-aleksey.makarov@linaro.org
State Accepted
Commit b077bafa2f3848ddfcef2ef3a4a61a867f9113b5
Headers show
Series
  • printk: fix double printing with earlycon
Related show

Commit Message

Aleksey Makarov March 2, 2017, 1:11 p.m.
The variable preferred_console is used only inside register_console()
and its semantics is boolean.  It is negative when no console has been
made preferred.

Make it static bool and rename to has_preferred.

Renaming was suggested by Peter Hurley

Signed-off-by: Aleksey Makarov <aleksey.makarov@linaro.org>

---
 kernel/printk/printk.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

-- 
2.11.1

Comments

Steven Rostedt March 2, 2017, 2:49 p.m. | #1
On Thu,  2 Mar 2017 16:11:32 +0300
Aleksey Makarov <aleksey.makarov@linaro.org> wrote:

> The variable preferred_console is used only inside register_console()

> and its semantics is boolean.  It is negative when no console has been

> made preferred.

> 

> Make it static bool and rename to has_preferred.

> 

> Renaming was suggested by Peter Hurley

> 


Reviewed-by: Steven Rostedt (VMware) <rostedt@goodmis.org>


-- Steve

> Signed-off-by: Aleksey Makarov <aleksey.makarov@linaro.org>

> ---
Sergey Senozhatsky March 2, 2017, 3:59 p.m. | #2
On (03/02/17 09:49), Steven Rostedt wrote:
> > The variable preferred_console is used only inside register_console()

> > and its semantics is boolean.  It is negative when no console has been

> > made preferred.

> > 

> > Make it static bool and rename to has_preferred.

> > 

> > Renaming was suggested by Peter Hurley

> > 

> 

> Reviewed-by: Steven Rostedt (VMware) <rostedt@goodmis.org>

> 


Reviewed-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>


	-ss

Patch hide | download patch | download mbox

diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index 34da86e73d00..3c2234f21291 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -268,7 +268,6 @@  static struct console *exclusive_console;
 static struct console_cmdline console_cmdline[MAX_CMDLINECONSOLES];
 
 static int selected_console = -1;
-static int preferred_console = -1;
 int console_set_on_cmdline;
 EXPORT_SYMBOL(console_set_on_cmdline);
 
@@ -2406,6 +2405,7 @@  void register_console(struct console *newcon)
 	unsigned long flags;
 	struct console *bcon = NULL;
 	struct console_cmdline *c;
+	static bool has_preferred;
 
 	if (console_drivers)
 		for_each_console(bcon)
@@ -2432,15 +2432,15 @@  void register_console(struct console *newcon)
 	if (console_drivers && console_drivers->flags & CON_BOOT)
 		bcon = console_drivers;
 
-	if (preferred_console < 0 || bcon || !console_drivers)
-		preferred_console = selected_console;
+	if (!has_preferred || bcon || !console_drivers)
+		has_preferred = selected_console >= 0;
 
 	/*
 	 *	See if we want to use this console driver. If we
 	 *	didn't select a console we take the first one
 	 *	that registers here.
 	 */
-	if (preferred_console < 0) {
+	if (!has_preferred) {
 		if (newcon->index < 0)
 			newcon->index = 0;
 		if (newcon->setup == NULL ||
@@ -2448,7 +2448,7 @@  void register_console(struct console *newcon)
 			newcon->flags |= CON_ENABLED;
 			if (newcon->device) {
 				newcon->flags |= CON_CONSDEV;
-				preferred_console = 0;
+				has_preferred = true;
 			}
 		}
 	}
@@ -2483,7 +2483,7 @@  void register_console(struct console *newcon)
 		newcon->flags |= CON_ENABLED;
 		if (i == selected_console) {
 			newcon->flags |= CON_CONSDEV;
-			preferred_console = selected_console;
+			has_preferred = true;
 		}
 		break;
 	}