serial: cpm_uart: Use uart_circ_empty()
authorIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Mon, 20 Mar 2023 13:50:09 +0000 (15:50 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 29 Mar 2023 08:53:57 +0000 (10:53 +0200)
Use uart_circ_empty() instead of open coding it.

Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Link: https://lore.kernel.org/r/20230320135009.47170-2-ilpo.jarvinen@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/serial/cpm_uart/cpm_uart_core.c

index 5565f30..349e7da 100644 (file)
@@ -678,15 +678,14 @@ static int cpm_uart_tx_pump(struct uart_port *port)
        /* Pick next descriptor and fill from buffer */
        bdp = pinfo->tx_cur;
 
-       while (!(in_be16(&bdp->cbd_sc) & BD_SC_READY) &&
-              xmit->tail != xmit->head) {
+       while (!(in_be16(&bdp->cbd_sc) & BD_SC_READY) && !uart_circ_empty(xmit)) {
                count = 0;
                p = cpm2cpu_addr(in_be32(&bdp->cbd_bufaddr), pinfo);
                while (count < pinfo->tx_fifosize) {
                        *p++ = xmit->buf[xmit->tail];
                        uart_xmit_advance(port, 1);
                        count++;
-                       if (xmit->head == xmit->tail)
+                       if (uart_circ_empty(xmit))
                                break;
                }
                out_be16(&bdp->cbd_datlen, count);