summaryrefslogtreecommitdiff
path: root/drivers/tty
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2018-03-02 11:07:22 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-03-09 10:21:01 -0800
commit0c54922384c14c1794c75af07c542752ab11787d (patch)
tree3397ba39b6eaf5bcfedef5237a9dea6cbe032c6f /drivers/tty
parent686351f342fa745d10ddef08d0e930cf53b0c673 (diff)
serial: imx: simplify check that prevents starting PIO when DMA is in use
The original code looks as follows: if (sport->dma_is_enabled) { ... make sure TX DMA is running, i.e. .dma_is_txing = 1 } if (sport->dma_is_txing) return; As .dma_is_txing can only be true if .dma_is_enabled is, the return can go at the end of the first if body without an additional check. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
-rw-r--r--drivers/tty/serial/imx.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c
index b87e04334342..7356a848751e 100644
--- a/drivers/tty/serial/imx.c
+++ b/drivers/tty/serial/imx.c
@@ -504,10 +504,9 @@ static inline void imx_transmit_buffer(struct imx_port *sport)
imx_uart_writel(sport, temp, UCR1);
imx_dma_tx(sport);
}
- }
- if (sport->dma_is_txing)
return;
+ }
while (!uart_circ_empty(xmit) &&
!(imx_uart_readl(sport, uts_reg(sport)) & UTS_TXFULL)) {