Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Jiri Slaby <jslaby@suse.cz>
To:     gregkh@linuxfoundation.org
Cc:     linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org,
        Jiri Slaby <jslaby@suse.cz>
Subject: [PATCH 6/7] serial: pch: simplify pop_tx() even more
Date:   Tue,  3 May 2022 10:08:07 +0200
Message-Id: <20220503080808.28332-5-jslaby@suse.cz>
In-Reply-To: <20220503080808.28332-1-jslaby@suse.cz>
References: <20220503080613.27601-1-jslaby@suse.cz>
 <20220503080808.28332-1-jslaby@suse.cz>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

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>
---
 drivers/tty/serial/pch_uart.c | 12 +++++-------
 1 file 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)
-- 
2.36.0