From: Shawn Lin <shawn.lin@rock-chips.com>
Date: Wed, 9 Mar 2016 08:11:23 +0000 (+0800)
Subject: UPSTREAM: spi: rockchip: migrate to dmaengine_terminate_async
X-Git-Tag: firefly_0821_release~2441
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;ds=sidebyside;h=6c29c8fd8b3e8da734965183ffb41cb06459e1ea;hp=d6c1d4eadd00e7ab0b626244655d181cfe37c4bc;p=firefly-linux-kernel-4.4.55.git

UPSTREAM: spi: rockchip: migrate to dmaengine_terminate_async

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)
---

diff --git a/drivers/spi/spi-rockchip.c b/drivers/spi/spi-rockchip.c
index b8a462b0ae56..b4da09b1b069 100644
--- a/drivers/spi/spi-rockchip.c
+++ b/drivers/spi/spi-rockchip.c
@@ -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);