diff options
-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) | |||
518 | config.direction = DMA_MEM_TO_DEV; | 518 | config.direction = DMA_MEM_TO_DEV; |
519 | config.dst_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; | 519 | config.dst_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; |
520 | config.dst_maxburst = fpga_fifo_size(priv->regs) / 2 / 4; | 520 | config.dst_maxburst = fpga_fifo_size(priv->regs) / 2 / 4; |
521 | ret = chan->device->device_control(chan, DMA_SLAVE_CONFIG, | 521 | ret = dmaengine_slave_config(chan, &config); |
522 | (unsigned long)&config); | ||
523 | if (ret) { | 522 | if (ret) { |
524 | dev_err(priv->dev, "DMA slave configuration failed\n"); | 523 | dev_err(priv->dev, "DMA slave configuration failed\n"); |
525 | goto out_dma_unmap; | 524 | goto out_dma_unmap; |
@@ -532,9 +531,9 @@ static noinline int fpga_program_dma(struct fpga_dev *priv) | |||
532 | } | 531 | } |
533 | 532 | ||
534 | /* setup and submit the DMA transaction */ | 533 | /* setup and submit the DMA transaction */ |
535 | tx = chan->device->device_prep_dma_sg(chan, | 534 | |
536 | table.sgl, num_pages, | 535 | tx = dmaengine_prep_dma_sg(chan, table.sgl, num_pages, |
537 | vb->sglist, vb->sglen, 0); | 536 | vb->sglist, vb->sglen, 0); |
538 | if (!tx) { | 537 | if (!tx) { |
539 | dev_err(priv->dev, "Unable to prep DMA transaction\n"); | 538 | dev_err(priv->dev, "Unable to prep DMA transaction\n"); |
540 | ret = -ENOMEM; | 539 | ret = -ENOMEM; |