Skip to content

Commit

Permalink
printk/console: Remove unnecessary need_default_console manipulation
Browse files Browse the repository at this point in the history
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 <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
  • Loading branch information
pmladek committed Dec 6, 2021
1 parent a695337 commit f873efe
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions kernel/printk/printk.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down

0 comments on commit f873efe

Please sign in to comment.