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, 8 deletions

diff --git a/drivers/tty/serial/efm32-uart.c b/drivers/tty/serial/efm32-uart.c
index a8cbb2670521..bdf67b0cb8b6 100644
--- a/drivers/tty/serial/efm32-uart.c
+++ b/drivers/tty/serial/efm32-uart.c
@@ -194,8 +194,7 @@ static void efm32_uart_break_ctl(struct uart_port *port, int ctl)
         /* not possible without fiddling with gpios */
 }
 
-static void efm32_uart_rx_chars(struct efm32_uart_port *efm_port,
-                struct tty_struct *tty)
+static void efm32_uart_rx_chars(struct efm32_uart_port *efm_port)
 {
         struct uart_port *port = &efm_port->port;
 
@@ -237,8 +236,8 @@ static void efm32_uart_rx_chars(struct efm32_uart_port *efm_port,
                                         rxdata & UARTn_RXDATAX_RXDATA__MASK))
                         continue;
 
-                if (tty && (rxdata & port->ignore_status_mask) == 0)
-                        tty_insert_flip_char(tty,
+                if ((rxdata & port->ignore_status_mask) == 0)
+                        tty_insert_flip_char(&port->state->port,
                                         rxdata & UARTn_RXDATAX_RXDATA__MASK, flag);
         }
 }
@@ -249,15 +248,16 @@ static irqreturn_t efm32_uart_rxirq(int irq, void *data)
         u32 irqflag = efm32_uart_read32(efm_port, UARTn_IF);
         int handled = IRQ_NONE;
         struct uart_port *port = &efm_port->port;
+        struct tty_port *tport = &port->state->port;
         struct tty_struct *tty;
 
         spin_lock(&port->lock);
 
-        tty = tty_kref_get(port->state->port.tty);
+        tty = tty_kref_get(tport->tty);
 
         if (irqflag & UARTn_IF_RXDATAV) {
                 efm32_uart_write32(efm_port, UARTn_IF_RXDATAV, UARTn_IFC);
-                efm32_uart_rx_chars(efm_port, tty);
+                efm32_uart_rx_chars(efm_port);
 
                 handled = IRQ_HANDLED;
         }
@@ -265,8 +265,7 @@ static irqreturn_t efm32_uart_rxirq(int irq, void *data)
         if (irqflag & UARTn_IF_RXOF) {
                 efm32_uart_write32(efm_port, UARTn_IF_RXOF, UARTn_IFC);
                 port->icount.overrun++;
-                if (tty)
-                        tty_insert_flip_char(tty, 0, TTY_OVERRUN);
+                tty_insert_flip_char(tport, 0, TTY_OVERRUN);
 
                 handled = IRQ_HANDLED;
         }