kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

serial: earlycon: Refactor earlycon registration

Browse source 
Separate earlycon matching from registration; add register_earlycon
which initializes and registers the matched earlycon.

Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Peter Hurley 2015-03-09 16:27:20 -04:00 committed by Greg Kroah-Hartman
parent 6084688038
commit 7c53cb3de4
1 changed files with 25 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
drivers/tty/serial/earlycon.c
View file

@ -96,27 +96,13 @@ static int __init parse_options(struct earlycon_device *device, char *options)
return 0; return 0;
} }
int __init setup_earlycon(char *buf, const char *match,
int (*setup)(struct earlycon_device *, const char *)) static int __init
register_earlycon(char *buf, int (*setup)(struct earlycon_device *, const char *))
{ {
int err; int err;
size_t len;
struct uart_port *port = &early_console_dev.port; struct uart_port *port = &early_console_dev.port;
if (!buf || !match || !setup)
return 0;
len = strlen(match);
if (strncmp(buf, match, len))
return 0;
if (buf[len]) {
if (buf[len] != ',')
return 0;
buf += len + 1;
} else
buf = NULL;
/* On parsing error, pass the options buf to the setup function */ /* On parsing error, pass the options buf to the setup function */
if (buf && !parse_options(&early_console_dev, buf)) if (buf && !parse_options(&early_console_dev, buf))
buf = NULL; buf = NULL;
@ -136,6 +122,28 @@ int __init setup_earlycon(char *buf, const char *match,
return 0; return 0;
} }
int __init setup_earlycon(char *buf, const char *match,
int (*setup)(struct earlycon_device *, const char *))
{
size_t len;
if (!buf || !match || !setup)
return 0;
len = strlen(match);
if (strncmp(buf, match, len))
return 0;
if (buf[len]) {
if (buf[len] != ',')
return 0;
buf += len + 1;
} else
buf = NULL;
return register_earlycon(buf, setup);
}
int __init of_setup_earlycon(unsigned long addr, int __init of_setup_earlycon(unsigned long addr,
int (*setup)(struct earlycon_device *, const char *)) int (*setup)(struct earlycon_device *, const char *))
{ {