console: Drop double check for console_drivers being non-NULL
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Mon, 3 Feb 2020 13:31:25 +0000 (15:31 +0200)
committerPetr Mladek <pmladek@suse.com>
Tue, 11 Feb 2020 09:43:42 +0000 (10:43 +0100)
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>
kernel/printk/printk.c

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