spi: pxa2xx: Use newer more explicit DMAengine terminate API

Commit b36f09c3c441 ("dmaengine: Add transfer termination
synchronization support") marked dmaengine_terminate_all() as
deprecated and is being replaced by explicit synchronous and asynchronous
terminate functions.

Here DMA termination are done in two cases: FIFO overrun and module
removal.

FIFO overrun is handled in interrupt context and converting
dmaengine_terminate_all() to dmaengine_terminate_async() does the same than
before.

Using synchronous termination in module removal however adds a bit more
robustness as it waits all completion callbacks have finished. Although it
looks all known DMA engines used with spi-pxa2xx don't implement
device_synchronize() callback so this too appears to be a no-op in
practice.

Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Acked-by: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/spi/spi-pxa2xx-dma.c b/drivers/spi/spi-pxa2xx-dma.c
index bd8b369a343c98e0c98141295c9f73d63d65ce72..365fc22c35729372e22dee90271dc3a37820d27c 100644 (file)
--- a/drivers/spi/spi-pxa2xx-dma.c
+++ b/drivers/spi/spi-pxa2xx-dma.c
@@ -254,8 +254,8 @@ irqreturn_t pxa2xx_spi_dma_transfer(struct driver_data *drv_data)
        if (status & SSSR_ROR) {
                dev_err(&drv_data->pdev->dev, "FIFO overrun\n");
 
-               dmaengine_terminate_all(drv_data->rx_chan);
-               dmaengine_terminate_all(drv_data->tx_chan);
+               dmaengine_terminate_async(drv_data->rx_chan);
+               dmaengine_terminate_async(drv_data->tx_chan);
 
                pxa2xx_spi_dma_transfer_complete(drv_data, true);
                return IRQ_HANDLED;
@@ -331,13 +331,13 @@ int pxa2xx_spi_dma_setup(struct driver_data *drv_data)
 void pxa2xx_spi_dma_release(struct driver_data *drv_data)
 {
        if (drv_data->rx_chan) {
-               dmaengine_terminate_all(drv_data->rx_chan);
+               dmaengine_terminate_sync(drv_data->rx_chan);
                dma_release_channel(drv_data->rx_chan);
                sg_free_table(&drv_data->rx_sgt);
                drv_data->rx_chan = NULL;
        }
        if (drv_data->tx_chan) {
-               dmaengine_terminate_all(drv_data->tx_chan);
+               dmaengine_terminate_sync(drv_data->tx_chan);
                dma_release_channel(drv_data->tx_chan);
                sg_free_table(&drv_data->tx_sgt);
                drv_data->tx_chan = NULL;