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 1/5] console: Don't perform test for CON_BRL flag twice
Date: Fri, 24 Jan 2020 17:57:28 +0200 [thread overview]
Message-ID: <20200124155733.54799-1-andriy.shevchenko@linux.intel.com> (raw)
The braille_unregister_console() already tests for console to have
CON_BRL flag. No need to repeat this in _braille_unregister_console().
However, we need to check for that flag at the beginning of the function
to avoid any regressions in the callers.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
v2: new patch
drivers/accessibility/braille/braille_console.c | 4 ++--
kernel/printk/braille.c | 5 +----
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/drivers/accessibility/braille/braille_console.c b/drivers/accessibility/braille/braille_console.c
index 1339c586bf64..f0ffccfb6bb7 100644
--- a/drivers/accessibility/braille/braille_console.c
+++ b/drivers/accessibility/braille/braille_console.c
@@ -369,10 +369,10 @@ int braille_register_console(struct console *console, int index,
int braille_unregister_console(struct console *console)
{
- if (braille_co != console)
- return -EINVAL;
if (!(console->flags & CON_BRL))
return 0;
+ if (braille_co != console)
+ return -EINVAL;
unregister_keyboard_notifier(&keyboard_notifier_block);
unregister_vt_notifier(&vt_notifier_block);
braille_co = NULL;
diff --git a/kernel/printk/braille.c b/kernel/printk/braille.c
index 17a9591e54ff..2ec42173890f 100644
--- a/kernel/printk/braille.c
+++ b/kernel/printk/braille.c
@@ -51,8 +51,5 @@ _braille_register_console(struct console *console, struct console_cmdline *c)
int
_braille_unregister_console(struct console *console)
{
- if (console->flags & CON_BRL)
- return braille_unregister_console(console);
-
- return 0;
+ return braille_unregister_console(console);
}
--
2.24.1
next 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 Andy Shevchenko [this message]
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 ` [PATCH v2 4/5] console: Avoid positive return code from unregister_console() Andy Shevchenko
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-1-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).