Skip to contentSkip to conversation

printk: Drop double check for console_drivers being non-NULL

PATCH In review Andy Shevchenko 1 participant 2 messages Jan 23, 2020 – Jan 24, 2020 Printk

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 printk: 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.

---
 kernel/printk/printk.c | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)
kernel/printk/printk.c +6 -10
index aa171d4e115c..011cdb97bcea 100644
@@ -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)) {
Signature · 1 line
2.24.1
#1 lore raw
Quoted 2 lines · Andy Shevchenko

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

I have a new version, which is series, with other clean ups.
So, while here is no changes expected, I think better to not apply it right now.

Signature · 2 lines
With Best Regards,
Andy Shevchenko