[PATCH v4 4/6] console: Avoid positive return code from unregister_console()

From: Andy Shevchenko
Date: Thu Jan 30 2020 - 10:26:04 EST


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@xxxxxxxxxxxxxxx>
---
v4: Drop return code mangling (Sergey, Petr), update commit message (Petr)
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 d40a316908da..932345e6cd71 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;
--
2.24.1