1 files changed, 4 insertions, 7 deletions

diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
index 7fca4022a8b2..3ea5408fcbeb 100644
--- a/drivers/tty/serial/amba-pl011.c
+++ b/drivers/tty/serial/amba-pl011.c
@@ -698,7 +698,7 @@ static void pl011_dma_rx_chars(struct uart_amba_port *uap,
                                u32 pending, bool use_buf_b,
                                bool readfifo)
 {
-        struct tty_struct *tty = uap->port.state->port.tty;
+        struct tty_port *port = &uap->port.state->port;
         struct pl011_sgbuf *sgbuf = use_buf_b ?
                 &uap->dmarx.sgbuf_b : &uap->dmarx.sgbuf_a;
         struct device *dev = uap->dmarx.chan->device->dev;
@@ -715,8 +715,7 @@ static void pl011_dma_rx_chars(struct uart_amba_port *uap,
                  * Note that tty_insert_flip_buf() tries to take as many chars
                  * as it can.
                  */
-                dma_count = tty_insert_flip_string(uap->port.state->port.tty,
-                                                   sgbuf->buf, pending);
+                dma_count = tty_insert_flip_string(port, sgbuf->buf, pending);
 
                 /* Return buffer to device */
                 dma_sync_sg_for_device(dev, &sgbuf->sg, 1, DMA_FROM_DEVICE);
@@ -754,7 +753,7 @@ static void pl011_dma_rx_chars(struct uart_amba_port *uap,
         dev_vdbg(uap->port.dev,
                  "Took %d chars from DMA buffer and %d chars from the FIFO\n",
                  dma_count, fifotaken);
-        tty_flip_buffer_push(tty);
+        tty_flip_buffer_push(port);
         spin_lock(&uap->port.lock);
 }
 
@@ -1076,12 +1075,10 @@ static void pl011_enable_ms(struct uart_port *port)
 
 static void pl011_rx_chars(struct uart_amba_port *uap)
 {
-        struct tty_struct *tty = uap->port.state->port.tty;
-
         pl011_fifo_to_tty(uap);
 
         spin_unlock(&uap->port.lock);
-        tty_flip_buffer_push(tty);
+        tty_flip_buffer_push(&uap->port.state->port);
         /*
          * If we were temporarily out of DMA mode for a while,
          * attempt to switch back to DMA mode again.