diff options
| author | Peter Hurley <peter@hurleysoftware.com> | 2015-03-09 16:27:15 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-03-26 16:17:55 +0100 |
| commit | feed5bab0d33feb5dbe5365b34d044c79f93dc6b (patch) | |
| tree | c5dfaa9c3b06c2fa010df1d0d8c8af14164dc732 /drivers/tty | |
| parent | d0d654ce53ab34f9306630ebcbfc477a994ea662 (diff) | |
| download | linux-feed5bab0d33feb5dbe5365b34d044c79f93dc6b.tar.gz linux-feed5bab0d33feb5dbe5365b34d044c79f93dc6b.tar.bz2 linux-feed5bab0d33feb5dbe5365b34d044c79f93dc6b.zip | |
serial: earlycon: Move ->uartclk initialize
Initializing the ->uartclk field is not related to option parsing;
relocate from parse_options() to setup_earlycon() (which mirrors the
behavior of of_setup_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>
Diffstat (limited to 'drivers/tty')
| -rw-r--r-- | drivers/tty/serial/earlycon.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/tty/serial/earlycon.c b/drivers/tty/serial/earlycon.c index 58d6bcdaf31c..0480c8f24cbb 100644 --- a/drivers/tty/serial/earlycon.c +++ b/drivers/tty/serial/earlycon.c @@ -76,8 +76,6 @@ static int __init parse_options(struct earlycon_device *device, char *options) return -EINVAL; } - port->uartclk = BASE_BAUD * 16; - if (options) { device->baud = simple_strtoul(options, NULL, 0); length = min(strcspn(options, " ") + 1, @@ -121,6 +119,7 @@ int __init setup_earlycon(char *buf, const char *match, if (!err) buf = NULL; + port->uartclk = BASE_BAUD * 16; if (port->mapbase) port->membase = earlycon_map(port->mapbase, 64); |