serial: imx: Replace dmaengine old API
authorFabien Lahoudere <fabien.lahoudere@collabora.co.uk>
Tue, 13 Sep 2016 08:17:05 +0000 (10:17 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 15 Sep 2016 10:35:49 +0000 (12:35 +0200)
dmaengine_terminate_all() is deprecated and should be replaced by
dmaengine_terminate_sync() in non-atomic context or dmaengine_terminate_async()
with dmaengine_synchronize().

See commit b36f09c3c441 ("dmaengine: Add transfer termination synchronization support")

Signed-off-by: Fabien Lahoudere <fabien.lahoudere@collabora.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/serial/imx.c

index 5240f9c080c363b1dd19e60713830498eaf06e39..a1d8174a098bdca005b19269aff85a5623d330f9 100644 (file)
@@ -1122,7 +1122,7 @@ static void imx_setup_ufcr(struct imx_port *sport,
 static void imx_uart_dma_exit(struct imx_port *sport)
 {
        if (sport->dma_chan_rx) {
-               dmaengine_terminate_all(sport->dma_chan_rx);
+               dmaengine_terminate_sync(sport->dma_chan_rx);
                dma_release_channel(sport->dma_chan_rx);
                sport->dma_chan_rx = NULL;
                sport->rx_cookie = -EINVAL;
@@ -1131,7 +1131,7 @@ static void imx_uart_dma_exit(struct imx_port *sport)
        }
 
        if (sport->dma_chan_tx) {
-               dmaengine_terminate_all(sport->dma_chan_tx);
+               dmaengine_terminate_sync(sport->dma_chan_tx);
                dma_release_channel(sport->dma_chan_tx);
                sport->dma_chan_tx = NULL;
        }
@@ -1351,8 +1351,8 @@ static void imx_shutdown(struct uart_port *port)
        if (sport->dma_is_enabled) {
                sport->dma_is_rxing = 0;
                sport->dma_is_txing = 0;
-               dmaengine_terminate_all(sport->dma_chan_tx);
-               dmaengine_terminate_all(sport->dma_chan_rx);
+               dmaengine_terminate_sync(sport->dma_chan_tx);
+               dmaengine_terminate_sync(sport->dma_chan_rx);
 
                spin_lock_irqsave(&sport->port.lock, flags);
                imx_stop_tx(port);