serial: 8250: Compute ttyS index from port minor
authorPeter Hurley <peter@hurleysoftware.com>
Tue, 24 Feb 2015 19:25:01 +0000 (14:25 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 26 Mar 2015 15:14:27 +0000 (16:14 +0100)
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>
drivers/tty/serial/8250/8250_core.c

index 7b502c0a848feca8f3c63597c07745c05675a284..b7f2d6c0d0039037abe89f79df6a217f5cba6711 100644 (file)
@@ -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 */