[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1457781733-2643-1-git-send-email-paul@crapouillou.net>
Date: Sat, 12 Mar 2016 12:22:13 +0100
From: Paul Cercueil <paul@...pouillou.net>
To: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
Cc: Jiri Slaby <jslaby@...e.com>,
Matt Redfearn <matt.redfearn@...tec.com>,
Paul Burton <paul.burton@...tec.com>,
Krzysztof Kozlowski <k.kozlowski@...sung.com>,
Peter Hurley <peter@...leysoftware.com>,
Paul Cercueil <paul@...pouillou.net>,
Masahiro Yamada <yamada.masahiro@...ionext.com>,
linux-serial@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: [PATCH v2] serial: 8250_ingenic: Remove global variable
Signed-off-by: Paul Cercueil <paul@...pouillou.net>
---
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
Powered by blists - more mailing lists