serial: 8250_dma: call serial8250_tx_dma unconditionally

[mirror_ubuntu-bionic-kernel.git] / drivers / tty / serial / 8250 / 8250_dma.c

diff --git a/drivers/tty/serial/8250/8250_dma.c b/drivers/tty/serial/8250/8250_dma.c
index db9eda3c12d67d9541449557eab9993ce437f226..b16f9b169202abbc626ca3454b3950227504853f 100644 (file)
--- a/drivers/tty/serial/8250/8250_dma.c
+++ b/drivers/tty/serial/8250/8250_dma.c
@@ -21,6 +21,7 @@ static void __dma_tx_complete(void *param)
        struct uart_8250_dma    *dma = p->dma;
        struct circ_buf         *xmit = &p->port.state->xmit;
        unsigned long   flags;
+       int             ret;
 
        dma_sync_single_for_cpu(dma->txchan->device->dev, dma->tx_addr,
                                UART_XMIT_SIZE, DMA_TO_DEVICE);
@@ -36,15 +37,11 @@ static void __dma_tx_complete(void *param)
        if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
                uart_write_wakeup(&p->port);
 
-       if (!uart_circ_empty(xmit) && !uart_tx_stopped(&p->port)) {
-               int ret;
-
-               ret = serial8250_tx_dma(p);
-               if (ret) {
-                       dma->tx_err = 1;
-                       p->ier |= UART_IER_THRI;
-                       serial_port_out(&p->port, UART_IER, p->ier);
-               }
+       ret = serial8250_tx_dma(p);
+       if (ret) {
+               dma->tx_err = 1;
+               p->ier |= UART_IER_THRI;
+               serial_port_out(&p->port, UART_IER, p->ier);
        }
 
        spin_unlock_irqrestore(&p->port.lock, flags);
@@ -118,7 +115,6 @@ err:
        dma->tx_err = 1;
        return ret;
 }
-EXPORT_SYMBOL_GPL(serial8250_tx_dma);
 
 int serial8250_rx_dma(struct uart_8250_port *p, unsigned int iir)
 {
@@ -165,7 +161,6 @@ int serial8250_rx_dma(struct uart_8250_port *p, unsigned int iir)
 
        return 0;
 }
-EXPORT_SYMBOL_GPL(serial8250_rx_dma);
 
 int serial8250_request_dma(struct uart_8250_port *p)
 {