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, 3 insertions, 7 deletions

diff --git a/drivers/tty/serial/ar933x_uart.c b/drivers/tty/serial/ar933x_uart.c
index 505c490c0b44..6ca5dd615f9e 100644
--- a/drivers/tty/serial/ar933x_uart.c
+++ b/drivers/tty/serial/ar933x_uart.c
@@ -297,10 +297,11 @@ static void ar933x_uart_set_termios(struct uart_port *port,
 
 static void ar933x_uart_rx_chars(struct ar933x_uart_port *up)
 {
+        struct tty_port *port = &up->port.state->port;
         struct tty_struct *tty;
         int max_count = 256;
 
-        tty = tty_port_tty_get(&up->port.state->port);
+        tty = tty_port_tty_get(port);
         do {
                 unsigned int rdata;
                 unsigned char ch;
@@ -313,11 +314,6 @@ static void ar933x_uart_rx_chars(struct ar933x_uart_port *up)
                 ar933x_uart_write(up, AR933X_UART_DATA_REG,
                                   AR933X_UART_DATA_RX_CSR);
 
-                if (!tty) {
-                        /* discard the data if no tty available */
-                        continue;
-                }
-
                 up->port.icount.rx++;
                 ch = rdata & AR933X_UART_DATA_TX_RX_MASK;
 
@@ -325,7 +321,7 @@ static void ar933x_uart_rx_chars(struct ar933x_uart_port *up)
                         continue;
 
                 if ((up->port.ignore_status_mask & AR933X_DUMMY_STATUS_RD) == 0)
-                        tty_insert_flip_char(tty, ch, TTY_NORMAL);
+                        tty_insert_flip_char(port, ch, TTY_NORMAL);
         } while (max_count-- > 0);
 
         if (tty) {