diff options
| author | Petr Mladek <pmladek@suse.com> | 2021-11-22 16:26:47 +0300 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.com> | 2021-12-06 16:07:57 +0300 |
| commit | f873efe841f813303e8a4af0d4cc48ff1f43bbe2 (patch) | |
| tree | 863485b6d4c9e739a99a29c25f190098aeec9f43 /kernel/printk | |
| parent | a6953370d2fcf8c3878f1588771d20d3d972fcf3 (diff) | |
| download | linux-f873efe841f813303e8a4af0d4cc48ff1f43bbe2.tar.xz | |
printk/console: Remove unnecessary need_default_console manipulation
There is no need to clear @need_default_console when a console
preferred by the command line, device tree, or SPCR, gets enabled.
The code is called only when some non-braille console matched a console
in @console_cmdline array. It means that a non-braille console was added
in __add_preferred_console() and the variable preferred_console is set
to a number >= 0. As a result, @need_default_console is always set to
"false" in the magic condition:
if (need_default_console || bcon || !console_drivers)
need_default_console = preferred_console < 0;
This is one small step in removing the above magic condition
that is hard to follow.
The patch removes one superfluous assignment and should not change
the functionality.
Signed-off-by: Petr Mladek <pmladek@suse.com>
Link: https://lore.kernel.org/r/20211122132649.12737-4-pmladek@suse.com
Diffstat (limited to 'kernel/printk')
| -rw-r--r-- | kernel/printk/printk.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index 4c5f496877b0..3f845daa3a4a 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -2892,10 +2892,8 @@ static int try_enable_preferred_console(struct console *newcon, return err; } newcon->flags |= CON_ENABLED; - if (i == preferred_console) { + if (i == preferred_console) newcon->flags |= CON_CONSDEV; - need_default_console = false; - } return 0; } |