TTY: switch tty_flip_buffer_push

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

diff --git a/drivers/tty/serial/m32r_sio.c b/drivers/tty/serial/m32r_sio.c
index b13949ad34089e01b58af1b597f2d3dc6baa42f4..bb1afa0922e1ac1a2fe7664240a2df2fc71b1b53 100644 (file)
--- a/drivers/tty/serial/m32r_sio.c
+++ b/drivers/tty/serial/m32r_sio.c
@@ -300,7 +300,7 @@ static void m32r_sio_enable_ms(struct uart_port *port)
 
 static void receive_chars(struct uart_sio_port *up, int *status)
 {
-       struct tty_struct *tty = up->port.state->port.tty;
+       struct tty_port *port = &up->port.state->port;
        unsigned char ch;
        unsigned char flag;
        int max_count = 256;
@@ -355,7 +355,7 @@ static void receive_chars(struct uart_sio_port *up, int *status)
                if (uart_handle_sysrq_char(&up->port, ch))
                        goto ignore_char;
                if ((*status & up->port.ignore_status_mask) == 0)
-                       tty_insert_flip_char(tty, ch, flag);
+                       tty_insert_flip_char(port, ch, flag);
 
                if (*status & UART_LSR_OE) {
                        /*
@@ -363,12 +363,12 @@ static void receive_chars(struct uart_sio_port *up, int *status)
                         * immediately, and doesn't affect the current
                         * character.
                         */
-                       tty_insert_flip_char(tty, 0, TTY_OVERRUN);
+                       tty_insert_flip_char(port, 0, TTY_OVERRUN);
                }
        ignore_char:
                *status = serial_in(up, UART_LSR);
        } while ((*status & UART_LSR_DR) && (max_count-- > 0));
-       tty_flip_buffer_push(tty);
+       tty_flip_buffer_push(port);
 }
 
 static void transmit_chars(struct uart_sio_port *up)