2ed2b8621b
commit bbeddf52adc1 ("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. commit 2cfe6c4ac7ee
("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>
56 lines
1.0 KiB
C
56 lines
1.0 KiB
C
#ifndef _PRINTK_BRAILLE_H
|
|
#define _PRINTK_BRAILLE_H
|
|
|
|
#ifdef CONFIG_A11Y_BRAILLE_CONSOLE
|
|
|
|
static inline void
|
|
braille_set_options(struct console_cmdline *c, char *brl_options)
|
|
{
|
|
c->brl_options = brl_options;
|
|
}
|
|
|
|
/*
|
|
* Setup console according to braille options.
|
|
* Return -EINVAL on syntax error, 0 on success (or no braille option was
|
|
* actually given).
|
|
* Modifies str to point to the serial options
|
|
* Sets brl_options to the parsed braille options.
|
|
*/
|
|
int
|
|
_braille_console_setup(char **str, char **brl_options);
|
|
|
|
int
|
|
_braille_register_console(struct console *console, struct console_cmdline *c);
|
|
|
|
int
|
|
_braille_unregister_console(struct console *console);
|
|
|
|
#else
|
|
|
|
static inline void
|
|
braille_set_options(struct console_cmdline *c, char *brl_options)
|
|
{
|
|
}
|
|
|
|
static inline int
|
|
_braille_console_setup(char **str, char **brl_options)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static inline int
|
|
_braille_register_console(struct console *console, struct console_cmdline *c)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static inline int
|
|
_braille_unregister_console(struct console *console)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
#endif
|
|
|
|
#endif
|