From: Robert Baldyga <r.baldyga@samsung.com>
Date: Wed, 28 Jan 2015 13:44:23 +0000 (+0100)
Subject: serial: samsung: remove redundant interrupt enabling
X-Git-Tag: firefly_0821_release~176^2~2319^2~8
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ba019a3e2ad53dcc56f3c0b15e1061b77129b63d;p=firefly-linux-kernel-4.4.55.git

serial: samsung: remove redundant interrupt enabling

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>
---

diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c
index a6bef8dcdc3c..236abae97613 100644
--- a/drivers/tty/serial/samsung.c
+++ b/drivers/tty/serial/samsung.c
@@ -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) {