]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
serial: samsung: remove redundant interrupt enabling
authorRobert Baldyga <r.baldyga@samsung.com>
Wed, 28 Jan 2015 13:44:23 +0000 (14:44 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 2 Feb 2015 18:11:28 +0000 (10:11 -0800)
Function s3c24xx_serial_start_tx_pio() enables interrupts if needed,
so we don't have to (or even we shouldn't) enable them before.

Signed-off-by: Robert Baldyga <r.baldyga@samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/serial/samsung.c

index a6bef8dcdc3cbb0c323622839ac124cc2f042191..236abae97613a383f1cc6030b1d01aa0a58919a8 100644 (file)
@@ -358,15 +358,8 @@ void s3c24xx_serial_start_tx(struct uart_port *port)
                        s3c24xx_serial_rx_disable(port);
 
                tx_enabled(port) = 1;
-               if (!ourport->dma || !ourport->dma->tx_chan) {
-                       if (s3c24xx_serial_has_interrupt_mask(port))
-                               __clear_bit(S3C64XX_UINTM_TXD,
-                                               portaddrl(port, S3C64XX_UINTM));
-                       else
-                               enable_irq(ourport->tx_irq);
-
+               if (!ourport->dma || !ourport->dma->tx_chan)
                        s3c24xx_serial_start_tx_pio(ourport);
-               }
        }
 
        if (ourport->dma && ourport->dma->tx_chan) {