Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma

Pull slave-dmaengine updates from Vinod Koul:
 "For dmaengine contributions we have:
   - designware cleanup by Andy
   - my series moving device_control users to dmanegine_xxx APIs for
     later removal of device_control API
   - minor fixes spread over drivers mainly mv_xor, pl330, mmp, imx-sdma
     etc"

* 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma: (60 commits)
  serial: atmel: add missing dmaengine header
  dmaengine: remove FSLDMA_EXTERNAL_START
  dmaengine: freescale: remove FSLDMA_EXTERNAL_START control method
  carma-fpga: move to fsl_dma_external_start()
  carma-fpga: use dmaengine_xxx() API
  dmaengine: freescale: add and export fsl_dma_external_start()
  dmaengine: add dmaengine_prep_dma_sg() helper
  video: mx3fb: use dmaengine_terminate_all() API
  serial: sh-sci: use dmaengine_terminate_all() API
  net: ks8842: use dmaengine_terminate_all() API
  mtd: sh_flctl: use dmaengine_terminate_all() API
  mtd: fsmc_nand: use dmaengine_terminate_all() API
  V4L2: mx3_camer: use dmaengine_pause() API
  dmaengine: coh901318: use dmaengine_terminate_all() API
  pata_arasan_cf: use dmaengine_terminate_all() API
  dmaengine: edma: check for echan->edesc => NULL in edma_dma_pause()
  dmaengine: dw: export probe()/remove() and Co to users
  dmaengine: dw: enable and disable controller when needed
  dmaengine: dw: always export dw_dma_{en,dis}able
  dmaengine: dw: introduce dw_dma_on() helper
  ...

1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/misc/carma/carma-fpga-program.c b/drivers/misc/carma/carma-fpga-program.c
index 7e97e53f9ff2..339b252fcedd 100644
--- a/drivers/misc/carma/carma-fpga-program.c
+++ b/drivers/misc/carma/carma-fpga-program.c
@@ -16,6 +16,7 @@
 #include <linux/completion.h>
 #include <linux/miscdevice.h>
 #include <linux/dmaengine.h>
+#include <linux/fsldma.h>
 #include <linux/interrupt.h>
 #include <linux/highmem.h>
 #include <linux/kernel.h>
@@ -518,23 +519,22 @@ static noinline int fpga_program_dma(struct fpga_dev *priv)
         config.direction = DMA_MEM_TO_DEV;
         config.dst_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
         config.dst_maxburst = fpga_fifo_size(priv->regs) / 2 / 4;
-        ret = chan->device->device_control(chan, DMA_SLAVE_CONFIG,
-                                           (unsigned long)&config);
+        ret = dmaengine_slave_config(chan, &config);
         if (ret) {
                 dev_err(priv->dev, "DMA slave configuration failed\n");
                 goto out_dma_unmap;
         }
 
-        ret = chan->device->device_control(chan, FSLDMA_EXTERNAL_START, 1);
+        ret = fsl_dma_external_start(chan, 1)
         if (ret) {
                 dev_err(priv->dev, "DMA external control setup failed\n");
                 goto out_dma_unmap;
         }
 
         /* setup and submit the DMA transaction */
-        tx = chan->device->device_prep_dma_sg(chan,
-                                              table.sgl, num_pages,
-                                              vb->sglist, vb->sglen, 0);
+
+        tx = dmaengine_prep_dma_sg(chan, table.sgl, num_pages,
+                        vb->sglist, vb->sglen, 0);
         if (!tx) {
                 dev_err(priv->dev, "Unable to prep DMA transaction\n");
                 ret = -ENOMEM;