From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Petr Mladek <pmladek@suse.com>,
Sergey Senozhatsky <sergey.senozhatsky@gmail.com>,
Steven Rostedt <rostedt@goodmis.org>,
linux-kernel@vger.kernel.org
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Subject: [PATCH v2 4/5] console: Avoid positive return code from unregister_console()
Date: Fri, 24 Jan 2020 17:57:31 +0200 [thread overview]
Message-ID: <20200124155733.54799-4-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <20200124155733.54799-1-andriy.shevchenko@linux.intel.com>
There are two callers which use the returned code from unregister_console().
In some cases, i.e. successfully unregistered Braille console or when console
has not been enabled the return code is 1. This code is ambiguous and also
prevents callers to distinguish successful operation.
Replace this logic to return only negative error codes or 0 when console,
either enabled, disabled or Braille has been successfully unregistered.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
v2: new patch
kernel/printk/printk.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index d40a316908da..da6a9bdf76b6 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -2817,10 +2817,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;
@@ -2838,6 +2840,9 @@ int unregister_console(struct console *console)
if (!res && (console->flags & CON_EXTENDED))
nr_ext_console_drivers--;
+ if (res && !(console->flags & CON_ENABLED))
+ res = 0;
+
/*
* If this isn't the last console and it has CON_CONSDEV set, we
* need to set it on the next preferred console.
--
2.24.1
next prev parent reply other threads:[~2020-01-24 15:57 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-24 15:57 [PATCH v2 1/5] console: Don't perform test for CON_BRL flag twice Andy Shevchenko
2020-01-24 15:57 ` [PATCH v2 2/5] console: Drop double check for console_drivers being non-NULL Andy Shevchenko
2020-01-24 15:57 ` [PATCH v2 3/5] console: Use for_each_console() helper in unregister_console() Andy Shevchenko
2020-01-24 15:57 ` Andy Shevchenko [this message]
2020-01-24 15:57 ` [PATCH v2 5/5] console: Introduce ->exit() callback Andy Shevchenko
2020-01-27 2:22 ` Sergey Senozhatsky
2020-01-27 9:42 ` Andy Shevchenko
2020-01-27 2:41 ` [PATCH v2 1/5] console: Don't perform test for CON_BRL flag twice Sergey Senozhatsky
2020-01-27 9:44 ` 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=20200124155733.54799-4-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;
as well as URLs for NNTP newsgroup(s).