diff options
author | Vinod Koul <vinod.koul@intel.com> | 2014-10-11 11:40:29 -0400 |
---|---|---|
committer | Vinod Koul <vinod.koul@intel.com> | 2014-10-15 12:00:59 -0400 |
commit | 72b2caff4aac45157f79502aae5019e96059b301 (patch) | |
tree | ae32aabf85ab69041ddd0d66168ac23832cb5f32 /drivers/ata | |
parent | 7d1311b93e58ed55f3a31cc8f94c4b8fe988a2b9 (diff) |
pata_arasan_cf: use dmaengine_terminate_all() API
The drivers should use dmaengine_terminate_all() API instead of accessing
the device_control which will be deprecated soon
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'drivers/ata')
-rw-r--r-- | drivers/ata/pata_arasan_cf.c | 5 |
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) | |||
420 | 420 | ||
421 | /* Wait for DMA to complete */ | 421 | /* Wait for DMA to complete */ |
422 | if (!wait_for_completion_timeout(&acdev->dma_completion, TIMEOUT)) { | 422 | if (!wait_for_completion_timeout(&acdev->dma_completion, TIMEOUT)) { |
423 | chan->device->device_control(chan, DMA_TERMINATE_ALL, 0); | 423 | dmaengine_terminate_all(chan); |
424 | dev_err(acdev->host->dev, "wait_for_completion_timeout\n"); | 424 | dev_err(acdev->host->dev, "wait_for_completion_timeout\n"); |
425 | return -ETIMEDOUT; | 425 | return -ETIMEDOUT; |
426 | } | 426 | } |
@@ -928,8 +928,7 @@ static int arasan_cf_suspend(struct device *dev) | |||
928 | struct arasan_cf_dev *acdev = host->ports[0]->private_data; | 928 | struct arasan_cf_dev *acdev = host->ports[0]->private_data; |
929 | 929 | ||
930 | if (acdev->dma_chan) | 930 | if (acdev->dma_chan) |
931 | acdev->dma_chan->device->device_control(acdev->dma_chan, | 931 | dmaengine_terminate_all(acdev->dma_chan); |
932 | DMA_TERMINATE_ALL, 0); | ||
933 | 932 | ||
934 | cf_exit(acdev); | 933 | cf_exit(acdev); |
935 | return ata_host_suspend(host, PMSG_SUSPEND); | 934 | return ata_host_suspend(host, PMSG_SUSPEND); |