serial: xilinx_uartps: return early in cdns_uart_handle_tx()
authorJiri Slaby <jslaby@suse.cz>
Thu, 21 Apr 2022 10:17:03 +0000 (12:17 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 22 Apr 2022 14:21:53 +0000 (16:21 +0200)
Return from the true branch of the 'if'. This saves one indentation
level and makes the code more readable.

The two comments about what obvious code does are removed too.

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

index 250a1d888eeb3507df0300e117c7fb2f21a5f337..b84ae9c07c3b5c2aae385d583912e8c42172178b 100644 (file)
@@ -317,37 +317,26 @@ static void cdns_uart_handle_tx(void *dev_id)
 
        if (uart_circ_empty(&port->state->xmit)) {
                writel(CDNS_UART_IXR_TXEMPTY, port->membase + CDNS_UART_IDR);
-       } else {
-               numbytes = port->fifosize;
-               while (numbytes && !uart_circ_empty(&port->state->xmit) &&
-                      !(readl(port->membase + CDNS_UART_SR) &
-                                               CDNS_UART_SR_TXFULL)) {
-                       /*
-                        * Get the data from the UART circular buffer
-                        * and write it to the cdns_uart's TX_FIFO
-                        * register.
-                        */
-                       writel(
-                               port->state->xmit.buf[port->state->xmit.tail],
-                                       port->membase + CDNS_UART_FIFO);
-
-                       port->icount.tx++;
-
-                       /*
-                        * Adjust the tail of the UART buffer and wrap
-                        * the buffer if it reaches limit.
-                        */
-                       port->state->xmit.tail =
-                               (port->state->xmit.tail + 1) &
-                                       (UART_XMIT_SIZE - 1);
-
-                       numbytes--;
-               }
+               return;
+       }
 
-               if (uart_circ_chars_pending(
-                               &port->state->xmit) < WAKEUP_CHARS)
-                       uart_write_wakeup(port);
+       numbytes = port->fifosize;
+       while (numbytes && !uart_circ_empty(&port->state->xmit) &&
+              !(readl(port->membase + CDNS_UART_SR) &
+                                       CDNS_UART_SR_TXFULL)) {
+
+               writel(port->state->xmit.buf[port->state->xmit.tail],
+                               port->membase + CDNS_UART_FIFO);
+
+               port->icount.tx++;
+               port->state->xmit.tail = (port->state->xmit.tail + 1) &
+                               (UART_XMIT_SIZE - 1);
+
+               numbytes--;
        }
+
+       if (uart_circ_chars_pending(&port->state->xmit) < WAKEUP_CHARS)
+               uart_write_wakeup(port);
 }
 
 /**