diff options
| author | Fabien Lahoudere <fabien.lahoudere@collabora.co.uk> | 2016-09-13 10:17:05 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-09-15 12:35:49 +0200 |
| commit | e5e8960236dbff4b49eac1ec7f47b1c912531b62 (patch) | |
| tree | 8d0aac3f2c125b893e7b3f28b2b786f4d9f473af /drivers/tty | |
| parent | a5a2b13074fd8d290bad32a5b0a0c5be9f3a84fa (diff) | |
| download | op-kernel-dev-e5e8960236dbff4b49eac1ec7f47b1c912531b62.zip op-kernel-dev-e5e8960236dbff4b49eac1ec7f47b1c912531b62.tar.gz | |
serial: imx: Replace dmaengine old API
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>
Diffstat (limited to 'drivers/tty')
| -rw-r--r-- | drivers/tty/serial/imx.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c index 5240f9c..a1d8174 100644 --- a/drivers/tty/serial/imx.c +++ b/drivers/tty/serial/imx.c @@ -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); |
