Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752760AbcCLLWw (ORCPT ); Sat, 12 Mar 2016 06:22:52 -0500 Received: from rev33.vpn.fdn.fr ([80.67.179.33]:45466 "EHLO outils.crapouillou.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751153AbcCLLWq (ORCPT ); Sat, 12 Mar 2016 06:22:46 -0500 From: Paul Cercueil To: Greg Kroah-Hartman Cc: Jiri Slaby , Matt Redfearn , Paul Burton , Krzysztof Kozlowski , Peter Hurley , Paul Cercueil , Masahiro Yamada , linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2] serial: 8250_ingenic: Remove global variable Date: Sat, 12 Mar 2016 12:22:13 +0100 Message-Id: <1457781733-2643-1-git-send-email-paul@crapouillou.net> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1417 Lines: 40 Signed-off-by: Paul Cercueil --- v2: Added changelog; nothing else changed v1: First version of this patch drivers/tty/serial/8250/8250_ingenic.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/tty/serial/8250/8250_ingenic.c b/drivers/tty/serial/8250/8250_ingenic.c index 155b785..aa1f156 100644 --- a/drivers/tty/serial/8250/8250_ingenic.c +++ b/drivers/tty/serial/8250/8250_ingenic.c @@ -49,8 +49,6 @@ static const struct of_device_id of_match[]; #define UART_MCR_FCM BIT(6) #ifdef CONFIG_SERIAL_EARLYCON -static struct earlycon_device *early_device; - static uint8_t __init early_in(struct uart_port *port, int offset) { return readl(port->membase + (offset << 2)); @@ -75,6 +73,8 @@ static void __init ingenic_early_console_putc(struct uart_port *port, int c) static void __init ingenic_early_console_write(struct console *console, const char *s, unsigned int count) { + struct earlycon_device *early_device = console->data; + uart_console_write(&early_device->port, s, count, ingenic_early_console_putc); } @@ -124,7 +124,7 @@ static int __init ingenic_early_console_setup(struct earlycon_device *dev, early_out(port, UART_DLM, (divisor >> 8) & 0xff); early_out(port, UART_LCR, UART_LCR_WLEN8); - early_device = dev; + dev->con->data = dev; dev->con->write = ingenic_early_console_write; return 0; -- 2.7.0