TTY: switch tty_insert_flip_char

Now, we start converting tty buffer functions to actually use
tty_port. This will allow us to get rid of the need of tty in many
call sites. Only tty_port will needed and hence no more
tty_port_tty_get in those paths.

tty_insert_flip_char is the next one to proceed. This one is used all
over the code, so the patch is huge.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 7 insertions, 5 deletions

diff --git a/drivers/tty/serial/msm_serial.c b/drivers/tty/serial/msm_serial.c
index 95fd39be2934..e4eb81a12793 100644
--- 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);