From 0c54922384c14c1794c75af07c542752ab11787d Mon Sep 17 00:00:00 2001 From: Uwe Kleine-König Date: Fri, 2 Mar 2018 11:07:22 +0100 Subject: serial: imx: simplify check that prevents starting PIO when DMA is in use MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Greg Kroah-Hartman --- drivers/tty/serial/imx.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'drivers/tty/serial/imx.c') 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)) { -- cgit v1.2.3-59-g8ed1b