[PATCH v2] serial: 8250_ingenic: Remove global variable

Path	csiph.com!news.mixmin.net!aioe.org!gothmog.csi.it!bofh.it!news.nic.it!robomod
From	Paul Cercueil <paul@crapouillou.net>
Newsgroups	linux.kernel
Subject	[PATCH v2] serial: 8250_ingenic: Remove global variable
Date	Sat, 12 Mar 2016 12:30:03 +0100
Message-ID	<rbPU7-5cN-33@gated-at.bofh.it> (permalink)
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	40
Organization	linux.* mail to news gateway
X-Original-Cc	Jiri Slaby <jslaby@suse.com>, Matt Redfearn <matt.redfearn@imgtec.com>, Paul Burton <paul.burton@imgtec.com>, Krzysztof Kozlowski <k.kozlowski@samsung.com>, Peter Hurley <peter@hurleysoftware.com>, Paul Cercueil <paul@crapouillou.net>, Masahiro Yamada <yamada.masahiro@socionext.com>, linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org
X-Original-Date	Sat, 12 Mar 2016 12:22:13 +0100
X-Original-Message-ID	<1457781733-2643-1-git-send-email-paul@crapouillou.net>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1356406

Show key headers only | View raw

Signed-off-by: Paul Cercueil <paul@crapouillou.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

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH v2] serial: 8250_ingenic: Remove global variable Paul Cercueil <paul@crapouillou.net> - 2016-03-12 12:30 +0100

csiph-web