Commit 12825e6b authored Feb 03, 2020 by Andy Shevchenko Committed by Petr Mladek Feb 11, 2020

console: Use for_each_console() helper in unregister_console()

We have rather open coded single linked list manipulations where we may
simple use for_each_console() helper with properly set exit conditions.

Replace open coded single-linked list handling with for_each_console()
helper in use.

Link: http://lkml.kernel.org/r/20200203133130.11591-3-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>

parent caa72c3b

kernel/printk/printk.c

+5 −6

Original line number	Diff line number	Diff line
		@@ -2809,7 +2809,7 @@ EXPORT_SYMBOL(register_console);

		int unregister_console(struct console *console)
		{
		struct console a, b;
		struct console *con;
		int res;

		pr_info("%sconsole [%s%d] disabled\n",
		@@ -2825,11 +2825,10 @@ int unregister_console(struct console *console)
		if (console_drivers == console) {
		console_drivers=console->next;
		res = 0;
		} else if (console_drivers) {
		for (a=console_drivers->next, b=console_drivers ;
		a; b=a, a=b->next) {
		if (a == console) {
		b->next = a->next;
		} else {
		for_each_console(con) {
		if (con->next == console) {
		con->next = console->next;
		res = 0;
		break;
		}

Admin message