From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753148AbbCAQGr (ORCPT ); Sun, 1 Mar 2015 11:06:47 -0500 Received: from mail-qg0-f44.google.com ([209.85.192.44]:36718 "EHLO mail-qg0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752538AbbCAQGh (ORCPT ); Sun, 1 Mar 2015 11:06:37 -0500 From: Peter Hurley To: Greg Kroah-Hartman , Andrew Morton Cc: Jiri Slaby , linux-kernel@vger.kernel.org, linux-serial@vger.kernel.org, Rob Herring , Peter Hurley Subject: [PATCH v2 -next 06/13] serial: earlycon: Move ->uartclk initialize Date: Sun, 1 Mar 2015 11:05:51 -0500 Message-Id: <1425225958-17908-7-git-send-email-peter@hurleysoftware.com> X-Mailer: git-send-email 2.3.0 In-Reply-To: <1425225958-17908-1-git-send-email-peter@hurleysoftware.com> References: <1425225958-17908-1-git-send-email-peter@hurleysoftware.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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