Messages in this thread Patch in this message | | | From | Andy Shevchenko <> | Subject | [PATCH v2 1/5] console: Don't perform test for CON_BRL flag twice | Date | Fri, 24 Jan 2020 17:57:28 +0200 |
| |
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
| |