projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'drm-intel-next-2014-10-24' of git://anongit.freedesktop.org/drm-intel...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
ata
/
pata_arasan_cf.c
diff --git
a/drivers/ata/pata_arasan_cf.c
b/drivers/ata/pata_arasan_cf.c
index 4edb1a81f63f68e3f37680b7334a3d7b81788f96..38216b991474d41192ab0c41d9b2265f5fa98ae3 100644
(file)
--- 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)) {
/* 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;
}
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)
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);
cf_exit(acdev);
return ata_host_suspend(host, PMSG_SUSPEND);