mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-26 22:24:09 +08:00
2ed2b8621b
commitbbeddf52ad
("printk: move braille console support into separate braille.[ch] files") introduced _braille_console_setup() to outline the braille initialization code. There was however some confusion over the value it was supposed to return. commit2cfe6c4ac7
("printk: Fix return of braille_register_console()") tried to fix it but failed to. This fixes and documents the returned value according to the use in printk.c: non-zero return means a parsing error, and thus this console configuration should be ignored. Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org> Cc: Aleksey Makarov <aleksey.makarov@linaro.org> Cc: Joe Perches <joe@perches.com> Cc: Ming Lei <ming.lei@canonical.com> Cc: Steven Rostedt <rostedt@goodmis.org> Acked-by: Petr Mladek <pmladek@suse.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
51 lines
965 B
C
51 lines
965 B
C
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/console.h>
|
|
#include <linux/errno.h>
|
|
#include <linux/string.h>
|
|
|
|
#include "console_cmdline.h"
|
|
#include "braille.h"
|
|
|
|
int _braille_console_setup(char **str, char **brl_options)
|
|
{
|
|
if (!strncmp(*str, "brl,", 4)) {
|
|
*brl_options = "";
|
|
*str += 4;
|
|
} else if (!strncmp(*str, "brl=", 4)) {
|
|
*brl_options = *str + 4;
|
|
*str = strchr(*brl_options, ',');
|
|
if (!*str) {
|
|
pr_err("need port name after brl=\n");
|
|
return -EINVAL;
|
|
}
|
|
*((*str)++) = 0;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
int
|
|
_braille_register_console(struct console *console, struct console_cmdline *c)
|
|
{
|
|
int rtn = 0;
|
|
|
|
if (c->brl_options) {
|
|
console->flags |= CON_BRL;
|
|
rtn = braille_register_console(console, c->index, c->options,
|
|
c->brl_options);
|
|
}
|
|
|
|
return rtn;
|
|
}
|
|
|
|
int
|
|
_braille_unregister_console(struct console *console)
|
|
{
|
|
if (console->flags & CON_BRL)
|
|
return braille_unregister_console(console);
|
|
|
|
return 0;
|
|
}
|