UPSTREAM: spi: rockchip: migrate to dmaengine_terminate_async
authorShawn Lin <shawn.lin@rock-chips.com>
Wed, 9 Mar 2016 08:11:23 +0000 (16:11 +0800)
committerHuang, Tao <huangtao@rock-chips.com>
Thu, 16 Jun 2016 12:56:53 +0000 (20:56 +0800)
dmaengine_terminate_all is deprecated, let's use
dmaengine_terminate_async for interrupt handling.

Change-Id: I8c06ef2147c0583d28eeed5b623920199efa9810
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
(cherry picked from git.kernel.org next/linux-next.git master
 commit 557b7ea34b9a10a5e13f4d7fd58ac965d801e3bd)

drivers/spi/spi-rockchip.c

index b8a462b0ae566ed37b5439d3050676dc73ceab41..b4da09b1b069109b68ab8520530fefe5142c5c0c 100644 (file)
@@ -322,12 +322,12 @@ static void rockchip_spi_handle_err(struct spi_master *master,
         */
        if (rs->use_dma) {
                if (rs->state & RXBUSY) {
-                       dmaengine_terminate_all(rs->dma_rx.ch);
+                       dmaengine_terminate_async(rs->dma_rx.ch);
                        flush_fifo(rs);
                }
 
                if (rs->state & TXBUSY)
-                       dmaengine_terminate_all(rs->dma_tx.ch);
+                       dmaengine_terminate_async(rs->dma_tx.ch);
        }
 
        spin_unlock_irqrestore(&rs->lock, flags);