summaryrefslogtreecommitdiff
path: root/drivers/spi
diff options
context:
space:
mode:
authorShawn Lin <shawn.lin@rock-chips.com>2016-03-09 16:11:23 +0800
committerMark Brown <broonie@kernel.org>2016-03-09 16:10:18 +0700
commit557b7ea34b9a10a5e13f4d7fd58ac965d801e3bd (patch)
tree9157344dc715d4db21dd62a5a76b2033d1b1af06 /drivers/spi
parentea98491133439773b69345eb9a314fc5f15e07a4 (diff)
downloadlinux-next-557b7ea34b9a10a5e13f4d7fd58ac965d801e3bd.tar.gz
spi: rockchip: migrate to dmaengine_terminate_async
dmaengine_terminate_all is deprecated, let's use dmaengine_terminate_async for interrupt handling. Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/spi-rockchip.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/spi-rockchip.c b/drivers/spi/spi-rockchip.c
index aa8528e9840c..b6b8a0bb5b2f 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);