serial: pch: remove xmit circ_buf size double check
authorJiri Slaby <jslaby@suse.cz>
Tue, 3 May 2022 08:08:06 +0000 (10:08 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 5 May 2022 20:42:46 +0000 (22:42 +0200)
One is in handle_tx() (as "min(xmit->head - xmit->tail, fifo_size))",
another one in pop_tx() (as uart_circ_empty(xmit)). So keep only the
latter.

This makes the code simpler and size variable is not needed now.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Link: https://lore.kernel.org/r/20220503080808.28332-4-jslaby@suse.cz
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/serial/pch_uart.c

index a90bdff609089b400fe00200b68eeee898bb6122..ae1d6b641253a663b878369b8edae102f812fe9b 100644 (file)
@@ -839,9 +839,7 @@ static int dma_handle_rx(struct eg20t_port *priv)
 static unsigned int handle_tx(struct eg20t_port *priv)
 {
        struct uart_port *port = &priv->port;
-       struct circ_buf *xmit = &port->state->xmit;
        int fifo_size;
-       int size;
        int tx_empty;
 
        if (!priv->start_tx) {
@@ -862,10 +860,7 @@ static unsigned int handle_tx(struct eg20t_port *priv)
                fifo_size--;
        }
 
-       size = min(xmit->head - xmit->tail, fifo_size);
-       if (size < 0)
-               size = fifo_size;
-       if (size && pop_tx(priv, size))
+       if (fifo_size && pop_tx(priv, fifo_size))
                tx_empty = 0;
 
        priv->tx_empty = tx_empty;