]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
carma-fpga: use dmaengine_xxx() API
authorVinod Koul <vinod.koul@intel.com>
Sat, 11 Oct 2014 15:46:45 +0000 (21:16 +0530)
committerVinod Koul <vinod.koul@intel.com>
Wed, 15 Oct 2014 16:01:28 +0000 (21:31 +0530)
The drivers should use dmaengine_slave_config() and dmaengine_prep_dma_sg()
API instead of accessing the device_control which will be deprecated soon

Signed-off-by: Vinod Koul <vinod.koul@intel.com>
drivers/misc/carma/carma-fpga-program.c

index 7be89832db19f90ca2e1182fe91b77fa08efcea1..fd0cb8b1eefb6fec8520734bb96855765f647daa 100644 (file)
@@ -518,8 +518,7 @@ 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;
@@ -532,9 +531,9 @@ static noinline int fpga_program_dma(struct fpga_dev *priv)
        }
 
        /* 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;