summaryrefslogtreecommitdiffstats
path: root/drivers/tty
diff options
context:
space:
mode:
authorRobert Baldyga <r.baldyga@samsung.com>2015-01-28 14:44:23 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-02-02 19:11:28 +0100
commitba019a3e2ad53dcc56f3c0b15e1061b77129b63d (patch)
treedb3bd2a4eb478737ff1a265b4951439d88920606 /drivers/tty
parenttty: Remove external interface for tty_set_termios() (diff)
downloadlinux-ba019a3e2ad53dcc56f3c0b15e1061b77129b63d.tar.xz
linux-ba019a3e2ad53dcc56f3c0b15e1061b77129b63d.zip
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>
Diffstat (limited to 'drivers/tty')
-rw-r--r--drivers/tty/serial/samsung.c9
1 files changed, 1 insertions, 8 deletions
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) {