summaryrefslogtreecommitdiffstats
path: root/drivers/ata/pata_arasan_cf.c
diff options
context:
space:
mode:
authorVinod Koul <vinod.koul@intel.com>2014-10-15 21:38:49 +0530
committerVinod Koul <vinod.koul@intel.com>2014-10-15 21:38:49 +0530
commit2856fcdc1f7b6dc237afc2dbec6fbd21fe88dd4e (patch)
treedf1adfeb56129acd267b658f81350437a5361b57 /drivers/ata/pata_arasan_cf.c
parent639559ada6194b722304fe267455b5bdf75c2f90 (diff)
parenta500789d42f478bc5511e1ddafadc323a6036d11 (diff)
downloadlinux-2856fcdc1f7b6dc237afc2dbec6fbd21fe88dd4e.tar.bz2
Merge branch 'topic/dma_control_cleanup_acks' into for-linus
Diffstat (limited to 'drivers/ata/pata_arasan_cf.c')
-rw-r--r--drivers/ata/pata_arasan_cf.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/ata/pata_arasan_cf.c b/drivers/ata/pata_arasan_cf.c
index 4edb1a81f63f..38216b991474 100644
--- a/drivers/ata/pata_arasan_cf.c
+++ b/drivers/ata/pata_arasan_cf.c
@@ -420,7 +420,7 @@ dma_xfer(struct arasan_cf_dev *acdev, dma_addr_t src, dma_addr_t dest, u32 len)
/* Wait for DMA to complete */
if (!wait_for_completion_timeout(&acdev->dma_completion, TIMEOUT)) {
- chan->device->device_control(chan, DMA_TERMINATE_ALL, 0);
+ dmaengine_terminate_all(chan);
dev_err(acdev->host->dev, "wait_for_completion_timeout\n");
return -ETIMEDOUT;
}
@@ -928,8 +928,7 @@ static int arasan_cf_suspend(struct device *dev)
struct arasan_cf_dev *acdev = host->ports[0]->private_data;
if (acdev->dma_chan)
- acdev->dma_chan->device->device_control(acdev->dma_chan,
- DMA_TERMINATE_ALL, 0);
+ dmaengine_terminate_all(acdev->dma_chan);
cf_exit(acdev);
return ata_host_suspend(host, PMSG_SUSPEND);