public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Petr Mladek <pmladek@suse.com>,
	Sergey Senozhatsky <sergey.senozhatsky@gmail.com>,
	linux-kernel@vger.kernel.org,
	Steven Rostedt <rostedt@goodmis.org>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Subject: [PATCH v5 5/7] console: Avoid positive return code from unregister_console()
Date: Mon,  3 Feb 2020 15:31:28 +0200	[thread overview]
Message-ID: <20200203133130.11591-5-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <20200203133130.11591-1-andriy.shevchenko@linux.intel.com>

There are only two callers that use the returned code from
unregister_console():

  - unregister_early_console() in arch/m68k/kernel/early_printk.c
  - kgdb_unregister_nmi_console() in drivers/tty/serial/kgdb_nmi.c

They both expect to get "0" on success and a non-zero value on error.
But the current behavior is confusing and buggy:

  - _braille_unregister_console() returns "1" on success
  - unregister_console() returns "1" on error

Fix and clean up the behavior:

  - Return success when _braille_unregister_console() succeeded
  - Return a meaningful error code when the console was not registered before

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
v5: no change

 kernel/printk/printk.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index 463ed5c5474e..5fdae891a4cd 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -2823,10 +2823,12 @@ int unregister_console(struct console *console)
 		console->name, console->index);
 
 	res = _braille_unregister_console(console);
-	if (res)
+	if (res < 0)
 		return res;
+	if (res > 0)
+		return 0;
 
-	res = 1;
+	res = -ENODEV;
 	console_lock();
 	if (console_drivers == console) {
 		console_drivers=console->next;
-- 
2.24.1


  parent reply	other threads:[~2020-02-03 13:31 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-02-03 13:31 [PATCH v5 1/7] console: Don't perform test for CON_BRL flag Andy Shevchenko
2020-02-03 13:31 ` [PATCH v5 2/7] console: Drop double check for console_drivers being non-NULL Andy Shevchenko
2020-02-03 13:31 ` [PATCH v5 3/7] console: Use for_each_console() helper in unregister_console() Andy Shevchenko
2020-02-03 13:31 ` [PATCH v5 4/7] console: Drop misleading comment Andy Shevchenko
2020-02-03 13:31 ` Andy Shevchenko [this message]
2020-02-03 13:31 ` [PATCH v5 6/7] console: Don't notify user space when unregister non-listed console Andy Shevchenko
2020-02-03 13:31 ` [PATCH v5 7/7] console: Introduce ->exit() callback Andy Shevchenko
2020-02-04  1:34 ` [PATCH v5 1/7] console: Don't perform test for CON_BRL flag Sergey Senozhatsky
2020-02-11 11:32   ` Petr Mladek
2020-02-11 12:54     ` Andy Shevchenko

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200203133130.11591-5-andriy.shevchenko@linux.intel.com \
    --to=andriy.shevchenko@linux.intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=pmladek@suse.com \
    --cc=rostedt@goodmis.org \
    --cc=sergey.senozhatsky@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox