serial: msm: Use uart_xmit_advance()

Take advantage of the new uart_xmit_advance() helper.

Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Link: https://lore.kernel.org/r/20221019091151.6692-4-ilpo.jarvinen@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/tty/serial/msm_serial.c b/drivers/tty/serial/msm_serial.c
index 7dd19a2815794e9f3fb9264600843ac082cf6666..2b2e0f74b75a001be393b0ecd1588c310687dc2f 100644 (file)
--- a/drivers/tty/serial/msm_serial.c
+++ b/drivers/tty/serial/msm_serial.c
@@ -464,12 +464,9 @@ static void msm_complete_tx_dma(void *args)
        }
 
        count = dma->count - state.residue;
-       port->icount.tx += count;
+       uart_xmit_advance(port, count);
        dma->count = 0;
 
-       xmit->tail += count;
-       xmit->tail &= UART_XMIT_SIZE - 1;
-
        /* Restore "Tx FIFO below watermark" interrupt */
        msm_port->imr |= MSM_UART_IMR_TXLEV;
        msm_write(port, msm_port->imr, MSM_UART_IMR);
@@ -866,13 +863,11 @@ static void msm_handle_tx_pio(struct uart_port *port, unsigned int tx_count)
                else
                        num_chars = 1;
 
-               for (i = 0; i < num_chars; i++) {
+               for (i = 0; i < num_chars; i++)
                        buf[i] = xmit->buf[xmit->tail + i];
-                       port->icount.tx++;
-               }
 
                iowrite32_rep(tf, buf, 1);
-               xmit->tail = (xmit->tail + num_chars) & (UART_XMIT_SIZE - 1);
+               uart_xmit_advance(port, num_chars);
                tf_pointer += num_chars;
        }