From 5348a266e7384e9b2d7e02f6f34f90fb0ff34660 Mon Sep 17 00:00:00 2001
From: Tobias Klauser <tklauser@distanz.ch>
Date: Wed, 9 Feb 2011 10:57:04 +0100
Subject: [PATCH] --- yaml --- r: 235535 b: refs/heads/master c:
 2780ad42f5fe6739882603c61c8decba6e50eaa2 h: refs/heads/master i:   235533:
 9f168ad1cf7ddd798365cb112d9be6bc01af3a21   235531:
 79ed82f4b6c2bf69946ee0d4bc2210a414577c0a   235527:
 b1eca242bcc64754c3e31905a18ac93764780044   235519:
 eacc39709b9d7d7c441553dea179a2b5b9ee7adc v: v3

---
 [refs]                                 |  2 +-
 trunk/drivers/tty/serial/altera_uart.c | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index dc36a8246a54..3970ae098244 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e96fabd8791aad30a3c8a03919893ae3e2e3df25
+refs/heads/master: 2780ad42f5fe6739882603c61c8decba6e50eaa2
diff --git a/trunk/drivers/tty/serial/altera_uart.c b/trunk/drivers/tty/serial/altera_uart.c
index dee7a0eb6ea1..3a573528555e 100644
--- a/trunk/drivers/tty/serial/altera_uart.c
+++ b/trunk/drivers/tty/serial/altera_uart.c
@@ -86,16 +86,12 @@ struct altera_uart {
 
 static u32 altera_uart_readl(struct uart_port *port, int reg)
 {
-	struct altera_uart_platform_uart *platp = port->private_data;
-
-	return readl(port->membase + (reg << platp->bus_shift));
+	return readl(port->membase + (reg << port->regshift));
 }
 
 static void altera_uart_writel(struct uart_port *port, u32 dat, int reg)
 {
-	struct altera_uart_platform_uart *platp = port->private_data;
-
-	writel(dat, port->membase + (reg << platp->bus_shift));
+	writel(dat, port->membase + (reg << port->regshift));
 }
 
 static unsigned int altera_uart_tx_empty(struct uart_port *port)
@@ -546,13 +542,17 @@ static int __devinit altera_uart_probe(struct platform_device *pdev)
 	if (!port->membase)
 		return -ENOMEM;
 
+	if (platp)
+		port->regshift = platp->bus_shift;
+	else
+		port->regshift = 0;
+
 	port->line = i;
 	port->type = PORT_ALTERA_UART;
 	port->iotype = SERIAL_IO_MEM;
 	port->uartclk = platp->uartclk;
 	port->ops = &altera_uart_ops;
 	port->flags = UPF_BOOT_AUTOCONF;
-	port->private_data = platp;
 
 	uart_add_one_port(&altera_uart_driver, port);