diff options
| author | Jiri Slaby <jslaby@suse.cz> | 2022-05-03 10:08:07 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-05-05 22:42:47 +0200 |
| commit | 80219e59ff503f2ba7d87b9fda40c69e5ff71546 (patch) | |
| tree | 99322ece81b830f625e5fd04e1688ed30d3e0386 | |
| parent | serial: pch: remove xmit circ_buf size double check (diff) | |
| download | linux-80219e59ff503f2ba7d87b9fda40c69e5ff71546.tar.xz linux-80219e59ff503f2ba7d87b9fda40c69e5ff71546.zip | |
serial: pch: simplify pop_tx() even more
1) take uart_tx_stopped into account every loop (the same as other uart
drivers)
2) no need for 'count' variable, operate on 'size' directly
This allows inlining this into handle_tx() nicely in the next patch.
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Link: https://lore.kernel.org/r/20220503080808.28332-5-jslaby@suse.cz
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/tty/serial/pch_uart.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/tty/serial/pch_uart.c b/drivers/tty/serial/pch_uart.c index ae1d6b641253..e1eadf519089 100644 --- a/drivers/tty/serial/pch_uart.c +++ b/drivers/tty/serial/pch_uart.c @@ -759,21 +759,19 @@ static void pch_dma_tx_complete(void *arg) static bool pop_tx(struct eg20t_port *priv, unsigned int size) { - unsigned int count = 0; struct uart_port *port = &priv->port; struct circ_buf *xmit = &port->state->xmit; + bool ret = false; - if (uart_tx_stopped(port)) - return false; - - while (!uart_circ_empty(xmit) && count < size) { + while (!uart_tx_stopped(port) && !uart_circ_empty(xmit) && size) { iowrite8(xmit->buf[xmit->tail], priv->membase + PCH_UART_THR); xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1); port->icount.tx++; - count++; + size--; + ret = true; } - return count; + return ret; } static int handle_rx_to(struct eg20t_port *priv) |