TTY: switch tty_flip_buffer_push

[mirror_ubuntu-hirsute-kernel.git] / drivers / tty / serial / mfd.c

diff --git a/drivers/tty/serial/mfd.c b/drivers/tty/serial/mfd.c
index 60d585ab4870300210b6837507895edd08682b12..5f4765a7a5c54d6d3b845c9e9f7df402978afbff 100644 (file)
--- a/drivers/tty/serial/mfd.c
+++ b/drivers/tty/serial/mfd.c
@@ -388,12 +388,8 @@ void hsu_dma_rx(struct uart_hsu_port *up, u32 int_sts)
        struct hsu_dma_chan *chan = up->rxc;
        struct uart_port *port = &up->port;
        struct tty_port *tport = &port->state->port;
-       struct tty_struct *tty = tport->tty;
        int count;
 
-       if (!tty)
-               return;
-
        /*
         * First need to know how many is already transferred,
         * then check if its a timeout DMA irq, and return
@@ -438,7 +434,7 @@ void hsu_dma_rx(struct uart_hsu_port *up, u32 int_sts)
                                         | (0x1 << 16)
                                         | (0x1 << 24)  /* timeout bit, see HSU Errata 1 */
                                         );
-       tty_flip_buffer_push(tty);
+       tty_flip_buffer_push(tport);
 
        chan_writel(chan, HSU_CH_CR, 0x3);
 
@@ -461,13 +457,9 @@ static void serial_hsu_stop_rx(struct uart_port *port)
 
 static inline void receive_chars(struct uart_hsu_port *up, int *status)
 {
-       struct tty_struct *tty = up->port.state->port.tty;
        unsigned int ch, flag;
        unsigned int max_count = 256;
 
-       if (!tty)
-               return;
-
        do {
                ch = serial_in(up, UART_RX);
                flag = TTY_NORMAL;
@@ -523,7 +515,7 @@ static inline void receive_chars(struct uart_hsu_port *up, int *status)
        ignore_char:
                *status = serial_in(up, UART_LSR);
        } while ((*status & UART_LSR_DR) && max_count--);
-       tty_flip_buffer_push(tty);
+       tty_flip_buffer_push(&up->port.state->port);
 }
 
 static void transmit_chars(struct uart_hsu_port *up)