diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2014-10-11 19:46:45 +0400 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2014-10-15 20:01:28 +0400 |
| commit | 4fdcf68487e520844e077f75943b1e04cc05943b (patch) | |
| tree | abdc800014e7810b38e1346dc096cef1ac48b3bf /drivers | |
| parent | 0a5642be03293f73706961a7649ac1d12bd0be59 (diff) | |
| download | linux-4fdcf68487e520844e077f75943b1e04cc05943b.tar.xz | |
carma-fpga: use dmaengine_xxx() API
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/misc/carma/carma-fpga-program.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/misc/carma/carma-fpga-program.c b/drivers/misc/carma/carma-fpga-program.c index 7be89832db19..fd0cb8b1eefb 100644 --- a/drivers/misc/carma/carma-fpga-program.c +++ b/drivers/misc/carma/carma-fpga-program.c @@ -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; |