UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

console: Drop double check for console_drivers being non-NULL 

There is no need to explicitly check for console_drivers to be non-NULL
since for_each_console() does this.

Link: http://lkml.kernel.org/r/20200203133130.11591-2-andriy.shevchenko@linux.intel.com
To: linux-kernel@vger.kernel.org
To: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Petr Mladek <pmladek@suse.com>
Reviewed-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
Signed-off-by: Petr Mladek <pmladek@suse.com>
This commit is contained in:
Andy Shevchenko 2020-02-03 15:31:25 +02:00 committed by Petr Mladek
parent c81ea7203b
commit caa72c3bc5
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
kernel/printk/printk.c
View File

@ -1772,9 +1772,6 @@ static void call_console_drivers(const char *ext_text, size_t ext_len,
trace_console_rcuidle(text, len); trace_console_rcuidle(text, len);
if (!console_drivers)
return;
for_each_console(con) { for_each_console(con) {
if (exclusive_console && con != exclusive_console) if (exclusive_console && con != exclusive_console)
continue; continue;
@ -2653,18 +2650,17 @@ void register_console(struct console *newcon)
struct console_cmdline *c; struct console_cmdline *c;
static bool has_preferred; static bool has_preferred;
if (console_drivers) for_each_console(bcon) {
for_each_console(bcon) if (WARN(bcon == newcon, "console '%s%d' already registered\n",
if (WARN(bcon == newcon, bcon->name, bcon->index))
"console '%s%d' already registered\n", return;
bcon->name, bcon->index)) }
return;
/* /*
* before we register a new CON_BOOT console, make sure we don't * before we register a new CON_BOOT console, make sure we don't
* already have a valid console * already have a valid console
*/ */
if (console_drivers && newcon->flags & CON_BOOT) { if (newcon->flags & CON_BOOT) {
/* find the last or real console */ /* find the last or real console */
for_each_console(bcon) { for_each_console(bcon) {
if (!(bcon->flags & CON_BOOT)) { if (!(bcon->flags & CON_BOOT)) {