Skip to content

Commit

Permalink
printk: rename selected_console -> preferred_console
Browse files Browse the repository at this point in the history
The variable selected_console is set in __add_preferred_console()
to point to the last console parameter that was added to the
console_cmdline array.

Rename it to preferred_console so that the name reflects the usage.

Petr Mladek:
"[..] the selected_console/preferred_console
value is used to keep the console first in the console_drivers list.
IMHO, the main effect is that each line will first appear on this
console, see call_console_drivers(). But the message will still
appear also on all other enabled consoles. From this point,
the name "preferred" sounds better to me. More consoles
are selected (enabled) and only one is preferred (first)."

Link: http://lkml.kernel.org/r/20170315102854.1763-3-aleksey.makarov@linaro.org
Cc: Sudeep Holla <sudeep.holla@arm.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Jiri Slaby <jslaby@suse.com>
Cc: Robin Murphy <robin.murphy@arm.com>
Cc: "Nair, Jayachandran" <Jayachandran.Nair@cavium.com>
Cc: linux-serial@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Aleksey Makarov <aleksey.makarov@linaro.org>
Suggested-by: Peter Hurley <peter@hurleysoftware.com>
Acked-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Reviewed-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
Signed-off-by: Petr Mladek <pmladek@suse.com>
  • Loading branch information
Aleksey Makarov authored and Petr Mladek committed Apr 12, 2017
1 parent b077baf commit ad86ee2
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions kernel/printk/printk.c
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ 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);

Expand Down Expand Up @@ -1907,14 +1907,14 @@ static int __add_preferred_console(char *name, int idx, char *options,
i++, c++) {
if (strcmp(c->name, name) == 0 && c->index == idx) {
if (!brl_options)
selected_console = i;
preferred_console = i;
return 0;
}
}
if (i == MAX_CMDLINECONSOLES)
return -E2BIG;
if (!brl_options)
selected_console = i;
preferred_console = i;
strlcpy(c->name, name, sizeof(c->name));
c->options = options;
braille_set_options(c, brl_options);
Expand Down Expand Up @@ -2438,7 +2438,7 @@ void register_console(struct console *newcon)
bcon = console_drivers;

if (!has_preferred || bcon || !console_drivers)
has_preferred = selected_console >= 0;
has_preferred = preferred_console >= 0;

/*
* See if we want to use this console driver. If we
Expand Down Expand Up @@ -2486,7 +2486,7 @@ void register_console(struct console *newcon)
}

newcon->flags |= CON_ENABLED;
if (i == selected_console) {
if (i == preferred_console) {
newcon->flags |= CON_CONSDEV;
has_preferred = true;
}
Expand Down

0 comments on commit ad86ee2

Please sign in to comment.