diff options
| author | Jiri Slaby <jslaby@suse.cz> | 2022-05-03 11:08:06 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-05-05 23:42:46 +0300 |
| commit | 862526523e71a96e11ae48e081c424fdb1b50011 (patch) | |
| tree | 8150f9b63625cedcb186d7cfd8ba5ad683d0752d | |
| parent | 9bc995f51d7828bec9b7432f0034b6e31cefb851 (diff) | |
| download | linux-862526523e71a96e11ae48e081c424fdb1b50011.tar.xz | |
serial: pch: remove xmit circ_buf size double check
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>
| -rw-r--r-- | drivers/tty/serial/pch_uart.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/tty/serial/pch_uart.c b/drivers/tty/serial/pch_uart.c index a90bdff60908..ae1d6b641253 100644 --- a/drivers/tty/serial/pch_uart.c +++ b/drivers/tty/serial/pch_uart.c @@ -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; |