Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753626AbbBXQkA (ORCPT ); Tue, 24 Feb 2015 11:40:00 -0500 Received: from mail-qg0-f46.google.com ([209.85.192.46]:56041 "EHLO mail-qg0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752969AbbBXQhi (ORCPT ); Tue, 24 Feb 2015 11:37:38 -0500 From: Peter Hurley To: Greg Kroah-Hartman , Andrew Morton Cc: Arnd Bergmann , Rob Herring , Jiri Slaby , linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org, Peter Hurley Subject: [PATCH -next 06/13] serial: earlycon: Move ->uartclk initialize Date: Tue, 24 Feb 2015 11:37:03 -0500 Message-Id: <1424795830-31223-7-git-send-email-peter@hurleysoftware.com> X-Mailer: git-send-email 2.3.0 In-Reply-To: <1424795830-31223-1-git-send-email-peter@hurleysoftware.com> References: <1424795830-31223-1-git-send-email-peter@hurleysoftware.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1235 Lines: 38 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()). Signed-off-by: Peter Hurley --- drivers/tty/serial/earlycon.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/tty/serial/earlycon.c b/drivers/tty/serial/earlycon.c index 58d6bcd..0480c8f 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); -- 2.3.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/