TTY: switch tty_insert_flip_char

[karo-tx-linux.git] / drivers / tty / serial / msm_serial.c

diff --git a/drivers/tty/serial/msm_serial.c b/drivers/tty/serial/msm_serial.c
index 95fd39be29349857dd4c4380618e568135a09c1d..e4eb81a127931f34da9553870ffccfd5cc51c8f8 100644 (file)
--- a/drivers/tty/serial/msm_serial.c
+++ b/drivers/tty/serial/msm_serial.c
@@ -91,14 +91,15 @@ static void msm_enable_ms(struct uart_port *port)
 
 static void handle_rx_dm(struct uart_port *port, unsigned int misr)
 {
-       struct tty_struct *tty = port->state->port.tty;
+       struct tty_port *tport = &port->state->port;
+       struct tty_struct *tty = tport->tty;
        unsigned int sr;
        int count = 0;
        struct msm_port *msm_port = UART_TO_MSM(port);
 
        if ((msm_read(port, UART_SR) & UART_SR_OVERRUN)) {
                port->icount.overrun++;
-               tty_insert_flip_char(tty, 0, TTY_OVERRUN);
+               tty_insert_flip_char(tport, 0, TTY_OVERRUN);
                msm_write(port, UART_CR_CMD_RESET_ERR, UART_CR);
        }
 
@@ -146,7 +147,8 @@ static void handle_rx_dm(struct uart_port *port, unsigned int misr)
 
 static void handle_rx(struct uart_port *port)
 {
-       struct tty_struct *tty = port->state->port.tty;
+       struct tty_port *tport = &port->state->port;
+       struct tty_struct *tty = tport->tty;
        unsigned int sr;
 
        /*
@@ -155,7 +157,7 @@ static void handle_rx(struct uart_port *port)
         */
        if ((msm_read(port, UART_SR) & UART_SR_OVERRUN)) {
                port->icount.overrun++;
-               tty_insert_flip_char(tty, 0, TTY_OVERRUN);
+               tty_insert_flip_char(tport, 0, TTY_OVERRUN);
                msm_write(port, UART_CR_CMD_RESET_ERR, UART_CR);
        }
 
@@ -186,7 +188,7 @@ static void handle_rx(struct uart_port *port)
                }
 
                if (!uart_handle_sysrq_char(port, c))
-                       tty_insert_flip_char(tty, c, flag);
+                       tty_insert_flip_char(tport, c, flag);
        }
 
        tty_flip_buffer_push(tty);