|
@@ -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;
|