Received-SPF: pass (google.com: domain of linux-kernel+bounces-204193-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
From: Tony Lindgren <tony.lindgren@linux.intel.com>
To: Petr Mladek <pmladek@suse.com>,
	Steven Rostedt <rostedt@goodmis.org>,
	John Ogness <john.ogness@linutronix.de>,
	Sergey Senozhatsky <senozhatsky@chromium.org>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
	Tony Lindgren <tony@atomide.com>
Cc: =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= <ilpo.jarvinen@linux.intel.com>,
	linux-serial@vger.kernel.org,
	Tony Lindgren <tony.lindgren@linux.intel.com>,
	linux-kernel@vger.kernel.org
Subject: [PATCH 2/2] Revert "printk: Flag register_console() if console is set on command line"
Date: Thu,  6 Jun 2024 14:41:47 +0300
Message-ID: <20240606114149.118633-2-tony.lindgren@linux.intel.com>
In-Reply-To: <20240606114149.118633-1-tony.lindgren@linux.intel.com>
References: <20240606114149.118633-1-tony.lindgren@linux.intel.com>
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

This reverts commit b73c9cbe4f1fc02645228aa575998dd54067f8ef.

There is no need for this change now that we are reserving console_cmdline
slots for the DEVNAME:0.0 style consoles.

Signed-off-by: Tony Lindgren <tony.lindgren@linux.intel.com>
---
 kernel/printk/printk.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index 52bdd7dcdb6f..8b746eeb77fa 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -2541,9 +2541,6 @@ static int __init console_setup(char *str)
 	if (console_opt_save(str, brl_options))
 		return 1;
 
-	/* Flag register_console() to not call try_enable_default_console() */
-	console_set_on_cmdline = 1;
-
 	/* Don't attempt to parse a DEVNAME:0.0 style console */
 	if (strchr(str, ':')) {
 		reserve_deferred_console(str);
@@ -3578,7 +3575,7 @@ void register_console(struct console *newcon)
 	 * Note that a console with tty binding will have CON_CONSDEV
 	 * flag set and will be first in the list.
 	 */
-	if (preferred_console < 0 && !console_set_on_cmdline) {
+	if (preferred_console < 0) {
 		if (hlist_empty(&console_list) || !console_first()->device ||
 		    console_first()->flags & CON_BOOT) {
 			try_enable_default_console(newcon);
-- 
2.45.2