Merge branch 'topic/dma_control_cleanup_acks' into for-linus

8 files changed, 11 insertions, 17 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);
diff --git a/drivers/dma/coh901318.c b/drivers/dma/coh901318.c
index 3c6716e0b78e..e88588d8ecd3 100644
--- a/drivers/dma/coh901318.c
+++ b/drivers/dma/coh901318.c
@@ -2156,7 +2156,7 @@ coh901318_free_chan_resources(struct dma_chan *chan)
 
         spin_unlock_irqrestore(&cohc->lock, flags);
 
-        chan->device->device_control(chan, DMA_TERMINATE_ALL, 0);
+        dmaengine_terminate_all(chan);
 }
 
 
diff --git a/drivers/media/platform/soc_camera/mx3_camera.c b/drivers/media/platform/soc_camera/mx3_camera.c
index 83315dfeef62..7696a873510d 100644
--- a/drivers/media/platform/soc_camera/mx3_camera.c
+++ b/drivers/media/platform/soc_camera/mx3_camera.c
@@ -415,10 +415,8 @@ static void mx3_stop_streaming(struct vb2_queue *q)
         struct mx3_camera_buffer *buf, *tmp;
         unsigned long flags;
 
-        if (ichan) {
-                struct dma_chan *chan = &ichan->dma_chan;
-                chan->device->device_control(chan, DMA_PAUSE, 0);
-        }
+        if (ichan)
+                dmaengine_pause(&ichan->dma_chan);
 
         spin_lock_irqsave(&mx3_cam->lock, flags);
 
diff --git a/drivers/mtd/nand/fsmc_nand.c b/drivers/mtd/nand/fsmc_nand.c
index 1550692973dc..7a915870d9d6 100644
--- a/drivers/mtd/nand/fsmc_nand.c
+++ b/drivers/mtd/nand/fsmc_nand.c
@@ -605,7 +605,7 @@ static int dma_xfer(struct fsmc_nand_data *host, void *buffer, int len,
         wait_for_completion_timeout(&host->dma_access_complete,
                                 msecs_to_jiffies(3000));
         if (ret <= 0) {
-                chan->device->device_control(chan, DMA_TERMINATE_ALL, 0);
+                dmaengine_terminate_all(chan);
                 dev_err(host->dev, "wait_for_completion_timeout\n");
                 if (!ret)
                         ret = -ETIMEDOUT;
diff --git a/drivers/mtd/nand/sh_flctl.c b/drivers/mtd/nand/sh_flctl.c
index c0670237e7a2..0ed7c603298f 100644
--- a/drivers/mtd/nand/sh_flctl.c
+++ b/drivers/mtd/nand/sh_flctl.c
@@ -395,7 +395,7 @@ static int flctl_dma_fifo0_transfer(struct sh_flctl *flctl, unsigned long *buf,
                                 msecs_to_jiffies(3000));
 
         if (ret <= 0) {
-                chan->device->device_control(chan, DMA_TERMINATE_ALL, 0);
+                dmaengine_terminate_all(chan);
                 dev_err(&flctl->pdev->dev, "wait_for_completion_timeout\n");
         }
 
diff --git a/drivers/net/ethernet/micrel/ks8842.c b/drivers/net/ethernet/micrel/ks8842.c
index 822616e3c375..0c33b92a5a81 100644
--- a/drivers/net/ethernet/micrel/ks8842.c
+++ b/drivers/net/ethernet/micrel/ks8842.c
@@ -875,13 +875,11 @@ static void ks8842_stop_dma(struct ks8842_adapter *adapter)
 
         tx_ctl->adesc = NULL;
         if (tx_ctl->chan)
-                tx_ctl->chan->device->device_control(tx_ctl->chan,
-                        DMA_TERMINATE_ALL, 0);
+                dmaengine_terminate_all(tx_ctl->chan);
 
         rx_ctl->adesc = NULL;
         if (rx_ctl->chan)
-                rx_ctl->chan->device->device_control(rx_ctl->chan,
-                        DMA_TERMINATE_ALL, 0);
+                dmaengine_terminate_all(rx_ctl->chan);
 
         if (sg_dma_address(&rx_ctl->sg))
                 dma_unmap_single(adapter->dev, sg_dma_address(&rx_ctl->sg),
diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
index 3081e46085ce..eb17c7124e72 100644
--- a/drivers/tty/serial/sh-sci.c
+++ b/drivers/tty/serial/sh-sci.c
@@ -1403,7 +1403,7 @@ static void work_fn_rx(struct work_struct *work)
                 unsigned long flags;
                 int count;
 
-                chan->device->device_control(chan, DMA_TERMINATE_ALL, 0);
+                dmaengine_terminate_all(chan);
                 dev_dbg(port->dev, "Read %zu bytes with cookie %d\n",
                         sh_desc->partial, sh_desc->cookie);
 
diff --git a/drivers/video/fbdev/mx3fb.c b/drivers/video/fbdev/mx3fb.c
index c645a0a0c341..cdbc93a92185 100644
--- a/drivers/video/fbdev/mx3fb.c
+++ b/drivers/video/fbdev/mx3fb.c
@@ -461,8 +461,7 @@ static void sdc_disable_channel(struct mx3fb_info *mx3_fbi)
 
         spin_unlock_irqrestore(&mx3fb->lock, flags);
 
-        mx3_fbi->txd->chan->device->device_control(mx3_fbi->txd->chan,
-                                                   DMA_TERMINATE_ALL, 0);
+        dmaengine_terminate_all(mx3_fbi->txd->chan);
         mx3_fbi->txd = NULL;
         mx3_fbi->cookie = -EINVAL;
 }