OSDN Git Service

serial: 8250_core: remove redundant else keyword
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Thu, 22 Jan 2015 12:40:26 +0000 (14:40 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 2 Feb 2015 18:11:26 +0000 (10:11 -0800)
Since we return in the first branch the second one doesn't require an
additional else keyword. The patch removes it.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/serial/8250/8250_core.c

index 689169c..df8a5aa 100644 (file)
@@ -1376,9 +1376,11 @@ static void serial8250_start_tx(struct uart_port *port)
        struct uart_8250_port *up = up_to_u8250p(port);
 
        serial8250_rpm_get_tx(up);
-       if (up->dma && !up->dma->tx_dma(up)) {
+
+       if (up->dma && !up->dma->tx_dma(up))
                return;
-       } else if (!(up->ier & UART_IER_THRI)) {
+
+       if (!(up->ier & UART_IER_THRI)) {
                up->ier |= UART_IER_THRI;
                serial_port_out(port, UART_IER, up->ier);