TTY: switch tty_insert_flip_string

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_string this time.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

15 files changed, 35 insertions, 29 deletions

diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
index 7fca4022a8b2..e1257d17f5f0 100644
--- a/drivers/tty/serial/amba-pl011.c
+++ b/drivers/tty/serial/amba-pl011.c
@@ -698,7 +698,8 @@ 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 tty_struct *tty = port->tty;
         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 +716,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);
diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c
index 922e85aeb63a..929567038c5a 100644
--- a/drivers/tty/serial/atmel_serial.c
+++ b/drivers/tty/serial/atmel_serial.c
@@ -781,7 +781,8 @@ static void atmel_rx_from_ring(struct uart_port *port)
 static void atmel_rx_from_dma(struct uart_port *port)
 {
         struct atmel_uart_port *atmel_port = to_atmel_uart_port(port);
-        struct tty_struct *tty = port->state->port.tty;
+        struct tty_port *tport = &port->state->port;
+        struct tty_struct *tty = tport->tty;
         struct atmel_dma_buffer *pdc;
         int rx_idx = atmel_port->pdc_rx_idx;
         unsigned int head;
@@ -820,7 +821,8 @@ static void atmel_rx_from_dma(struct uart_port *port)
                          */
                         count = head - tail;
 
-                        tty_insert_flip_string(tty, pdc->buf + pdc->ofs, count);
+                        tty_insert_flip_string(tport, pdc->buf + pdc->ofs,
+                                                count);
 
                         dma_sync_single_for_device(port->dev, pdc->dma_addr,
                                         pdc->dma_size, DMA_FROM_DEVICE);
diff --git a/drivers/tty/serial/crisv10.c b/drivers/tty/serial/crisv10.c
index d12306625458..c82601d4dc53 100644
--- a/drivers/tty/serial/crisv10.c
+++ b/drivers/tty/serial/crisv10.c
@@ -2119,7 +2119,7 @@ static void flush_to_flip_buffer(struct e100_serial *info)
         while ((buffer = info->first_recv_buffer) != NULL) {
                 unsigned int count = buffer->length;
 
-                tty_insert_flip_string(tty, buffer->buffer, count);
+                tty_insert_flip_string(&info->port, buffer->buffer, count);
                 info->recv_cnt -= count;
 
                 if (count == buffer->length) {
diff --git a/drivers/tty/serial/icom.c b/drivers/tty/serial/icom.c
index 2b0b60ff7f01..54903ee5e5ab 100644
--- a/drivers/tty/serial/icom.c
+++ b/drivers/tty/serial/icom.c
@@ -762,7 +762,7 @@ static void recv_interrupt(u16 port_int_reg, struct icom_port *icom_port)
                 /* Block copy all but the last byte as this may have status */
                 if (count > 0) {
                         first = icom_port->recv_buf[offset];
-                        tty_insert_flip_string(tty, icom_port->recv_buf + offset, count - 1);
+                        tty_insert_flip_string(port, icom_port->recv_buf + offset, count - 1);
                 }
 
                 icount = &icom_port->uart_port.icount;
diff --git a/drivers/tty/serial/ifx6x60.c b/drivers/tty/serial/ifx6x60.c
index 675d94ab0aff..bfb634ea8145 100644
--- a/drivers/tty/serial/ifx6x60.c
+++ b/drivers/tty/serial/ifx6x60.c
@@ -672,7 +672,7 @@ static void ifx_spi_insert_flip_string(struct ifx_spi_device *ifx_dev,
         struct tty_struct *tty = tty_port_tty_get(&ifx_dev->tty_port);
         if (!tty)
                 return;
-        tty_insert_flip_string(tty, chars, size);
+        tty_insert_flip_string(&ifx_dev->tty_port, chars, size);
         tty_flip_buffer_push(tty);
         tty_kref_put(tty);
 }
diff --git a/drivers/tty/serial/ioc3_serial.c b/drivers/tty/serial/ioc3_serial.c
index d8f1d1d54471..0f25ce49c7f9 100644
--- a/drivers/tty/serial/ioc3_serial.c
+++ b/drivers/tty/serial/ioc3_serial.c
@@ -1415,7 +1415,8 @@ static int receive_chars(struct uart_port *the_port)
         read_count = do_read(the_port, ch, MAX_CHARS);
         if (read_count > 0) {
                 flip = 1;
-                read_room = tty_insert_flip_string(tty, ch, read_count);
+                read_room = tty_insert_flip_string(&state->port, ch,
+                                read_count);
                 the_port->icount.rx += read_count;
         }
         spin_unlock_irqrestore(&the_port->lock, pflags);
diff --git a/drivers/tty/serial/ioc4_serial.c b/drivers/tty/serial/ioc4_serial.c
index 710ce87ffbeb..3b021b03ae56 100644
--- a/drivers/tty/serial/ioc4_serial.c
+++ b/drivers/tty/serial/ioc4_serial.c
@@ -2362,7 +2362,7 @@ static void receive_chars(struct uart_port *the_port)
                 icount = &the_port->icount;
                 read_count = do_read(the_port, ch, request_count);
                 if (read_count > 0) {
-                        tty_insert_flip_string(tty, ch, read_count);
+                        tty_insert_flip_string(&state->port, ch, read_count);
                         icount->rx += read_count;
                 }
         }
diff --git a/drivers/tty/serial/jsm/jsm_tty.c b/drivers/tty/serial/jsm/jsm_tty.c
index ac1d36cb2032..c9ce00dd1f8a 100644
--- a/drivers/tty/serial/jsm/jsm_tty.c
+++ b/drivers/tty/serial/jsm/jsm_tty.c
@@ -640,7 +640,7 @@ void jsm_input(struct jsm_channel *ch)
                                         tty_insert_flip_char(port, *(ch->ch_rqueue +tail +i), TTY_NORMAL);
                         }
                 } else {
-                        tty_insert_flip_string(tp, ch->ch_rqueue + tail, s) ;
+                        tty_insert_flip_string(port, ch->ch_rqueue + tail, s);
                 }
                 tail += s;
                 n -= s;
diff --git a/drivers/tty/serial/mfd.c b/drivers/tty/serial/mfd.c
index 2c01344dc332..60d585ab4870 100644
--- a/drivers/tty/serial/mfd.c
+++ b/drivers/tty/serial/mfd.c
@@ -387,7 +387,8 @@ void hsu_dma_rx(struct uart_hsu_port *up, u32 int_sts)
         struct hsu_dma_buffer *dbuf = &up->rxbuf;
         struct hsu_dma_chan *chan = up->rxc;
         struct uart_port *port = &up->port;
-        struct tty_struct *tty = port->state->port.tty;
+        struct tty_port *tport = &port->state->port;
+        struct tty_struct *tty = tport->tty;
         int count;
 
         if (!tty)
@@ -423,7 +424,7 @@ void hsu_dma_rx(struct uart_hsu_port *up, u32 int_sts)
          * explicitly set tail to 0. So head will
          * always be greater than tail.
          */
-        tty_insert_flip_string(tty, dbuf->buf, count);
+        tty_insert_flip_string(tport, dbuf->buf, count);
         port->icount.rx += count;
 
         dma_sync_single_for_device(up->port.dev, dbuf->dma_addr,
diff --git a/drivers/tty/serial/mrst_max3110.c b/drivers/tty/serial/mrst_max3110.c
index 776431ff0190..3b8df7b93b73 100644
--- a/drivers/tty/serial/mrst_max3110.c
+++ b/drivers/tty/serial/mrst_max3110.c
@@ -374,7 +374,7 @@ receive_chars(struct uart_max3110 *max, unsigned short *str, int len)
         for (r = 0; w; r += usable, w -= usable) {
                 usable = tty_buffer_request_room(tport, w);
                 if (usable) {
-                        tty_insert_flip_string(tty, buf + r, usable);
+                        tty_insert_flip_string(tport, buf + r, usable);
                         port->icount.rx += usable;
                 }
         }
diff --git a/drivers/tty/serial/msm_serial.c b/drivers/tty/serial/msm_serial.c
index e4eb81a12793..cb787c0e279a 100644
--- a/drivers/tty/serial/msm_serial.c
+++ b/drivers/tty/serial/msm_serial.c
@@ -133,7 +133,7 @@ static void handle_rx_dm(struct uart_port *port, unsigned int misr)
                         port->icount.frame++;
 
                 /* TODO: handle sysrq */
-                tty_insert_flip_string(tty, (char *) &c,
+                tty_insert_flip_string(tport, (char *)&c,
                                        (count > 4) ? 4 : count);
                 count -= 4;
         }
diff --git a/drivers/tty/serial/msm_serial_hs.c b/drivers/tty/serial/msm_serial_hs.c
index 6aa9d470ef54..11b7f5b2eb5f 100644
--- a/drivers/tty/serial/msm_serial_hs.c
+++ b/drivers/tty/serial/msm_serial_hs.c
@@ -961,7 +961,7 @@ static void msm_hs_dmov_rx_callback(struct msm_dmov_cmd *cmd_ptr,
         rx_count = msm_hs_read(uport, UARTDM_RX_TOTAL_SNAP_ADDR);
 
         if (0 != (uport->read_status_mask & CREAD)) {
-                retval = tty_insert_flip_string(tty, msm_uport->rx.buffer,
+                retval = tty_insert_flip_string(port, msm_uport->rx.buffer,
                                                 rx_count);
                 BUG_ON(retval != rx_count);
         }
diff --git a/drivers/tty/serial/mxs-auart.c b/drivers/tty/serial/mxs-auart.c
index fa31bc38b105..37a0046ef531 100644
--- a/drivers/tty/serial/mxs-auart.c
+++ b/drivers/tty/serial/mxs-auart.c
@@ -457,7 +457,8 @@ static int mxs_auart_dma_prep_rx(struct mxs_auart_port *s);
 static void dma_rx_callback(void *arg)
 {
         struct mxs_auart_port *s = (struct mxs_auart_port *) arg;
-        struct tty_struct *tty = s->port.state->port.tty;
+        struct tty_port *port = &s->port.state->port;
+        struct tty_struct *tty = port->tty;
         int count;
         u32 stat;
 
@@ -468,7 +469,7 @@ static void dma_rx_callback(void *arg)
                         AUART_STAT_PERR | AUART_STAT_FERR);
 
         count = stat & AUART_STAT_RXCOUNT_MASK;
-        tty_insert_flip_string(tty, s->rx_dma_buf, count);
+        tty_insert_flip_string(port, s->rx_dma_buf, count);
 
         writel(stat, s->port.membase + AUART_STAT);
         tty_flip_buffer_push(tty);
diff --git a/drivers/tty/serial/pch_uart.c b/drivers/tty/serial/pch_uart.c
index 4f1774be2a8c..967f1cb311f3 100644
--- a/drivers/tty/serial/pch_uart.c
+++ b/drivers/tty/serial/pch_uart.c
@@ -591,17 +591,17 @@ static void pch_uart_hal_set_break(struct eg20t_port *priv, int on)
 static int push_rx(struct eg20t_port *priv, const unsigned char *buf,
                    int size)
 {
-        struct uart_port *port;
+        struct uart_port *port = &priv->port;
+        struct tty_port *tport = &port->state->port;
         struct tty_struct *tty;
 
-        port = &priv->port;
-        tty = tty_port_tty_get(&port->state->port);
+        tty = tty_port_tty_get(tport);
         if (!tty) {
                 dev_dbg(priv->port.dev, "%s:tty is busy now", __func__);
                 return -EBUSY;
         }
 
-        tty_insert_flip_string(tty, buf, size);
+        tty_insert_flip_string(tport, buf, size);
         tty_flip_buffer_push(tty);
         tty_kref_put(tty);
 
@@ -646,7 +646,7 @@ static int dma_push_rx(struct eg20t_port *priv, int size)
         if (!room)
                 return room;
 
-        tty_insert_flip_string(tty, sg_virt(&priv->sg_rx), size);
+        tty_insert_flip_string(tport, sg_virt(&priv->sg_rx), size);
 
         port->icount.rx += room;
         tty_kref_put(tty);
diff --git a/drivers/tty/serial/sunhv.c b/drivers/tty/serial/sunhv.c
index bbb102e3c035..defe92b19e16 100644
--- a/drivers/tty/serial/sunhv.c
+++ b/drivers/tty/serial/sunhv.c
@@ -72,7 +72,7 @@ static void transmit_chars_write(struct uart_port *port, struct circ_buf *xmit)
         }
 }
 
-static int receive_chars_getchar(struct uart_port *port, struct tty_struct *tty)
+static int receive_chars_getchar(struct uart_port *port)
 {
         int saw_console_brk = 0;
         int limit = 10000;
@@ -115,7 +115,7 @@ static int receive_chars_getchar(struct uart_port *port, struct tty_struct *tty)
         return saw_console_brk;
 }
 
-static int receive_chars_read(struct uart_port *port, struct tty_struct *tty)
+static int receive_chars_read(struct uart_port *port)
 {
         int saw_console_brk = 0;
         int limit = 10000;
@@ -152,12 +152,13 @@ static int receive_chars_read(struct uart_port *port, struct tty_struct *tty)
                 for (i = 0; i < bytes_read; i++)
                         uart_handle_sysrq_char(port, con_read_page[i]);
 
-                if (tty == NULL)
+                if (port->state == NULL)
                         continue;
 
                 port->icount.rx += bytes_read;
 
-                tty_insert_flip_string(tty, con_read_page, bytes_read);
+                tty_insert_flip_string(&port->state->port, con_read_page,
+                                bytes_read);
         }
 
         return saw_console_brk;
@@ -165,7 +166,7 @@ static int receive_chars_read(struct uart_port *port, struct tty_struct *tty)
 
 struct sunhv_ops {
         void (*transmit_chars)(struct uart_port *port, struct circ_buf *xmit);
-        int (*receive_chars)(struct uart_port *port, struct tty_struct *tty);
+        int (*receive_chars)(struct uart_port *port);
 };
 
 static struct sunhv_ops bychar_ops = {
@@ -187,7 +188,7 @@ static struct tty_struct *receive_chars(struct uart_port *port)
         if (port->state != NULL)                /* Unopened serial console */
                 tty = port->state->port.tty;
 
-        if (sunhv_ops->receive_chars(port, tty))
+        if (sunhv_ops->receive_chars(port))
                 sun_do_break();
 
         return tty;