From: Peter Hurley <peter@hurleysoftware.com>
Date: Tue, 24 Feb 2015 19:25:01 +0000 (-0500)
Subject: serial: 8250: Compute ttyS index from port minor
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=51c39814b6b23c0d7b0c47ba9236248576a164ad;p=linux-beck.git

serial: 8250: Compute ttyS index from port minor

Prepare for 8250 split; calculate the ttyS index directly from
the port minor which avoids the global serial8250_reg reference
from base port operations.

Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/tty/serial/8250/8250_core.c b/drivers/tty/serial/8250/8250_core.c
index 7b502c0a848f..b7f2d6c0d003 100644
--- a/drivers/tty/serial/8250/8250_core.c
+++ b/drivers/tty/serial/8250/8250_core.c
@@ -61,7 +61,7 @@ static struct uart_driver serial8250_reg;
 
 static int serial_index(struct uart_port *port)
 {
-	return (serial8250_reg.minor - 64) + port->line;
+	return port->minor - 64;
 }
 
 static unsigned int skip_txen_test; /* force skip of txen test at init time */