Skip to content

Commit 4153a7f

Browse files
Marek Vasutvinodkoul
authored andcommitted
dmaengine: xilinx: Add empty device_config function
Various DMA users call the dmaengine_slave_config() and expect it to succeed, but that can only succeed if .device_config is implemented. Add empty device_config function rather than patching all the places which use dmaengine_slave_config(). Signed-off-by: Marek Vasut <[email protected]> Cc: Akinobu Mita <[email protected]> Cc: Kedareswara rao Appana <[email protected]> Cc: Michal Simek <[email protected]> Cc: Vinod Koul <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Vinod Koul <[email protected]>
1 parent d6ff82c commit 4153a7f

File tree

1 file changed

+12
-0
lines changed

1 file changed

+12
-0
lines changed

drivers/dma/xilinx/xilinx_dma.c

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1657,6 +1657,17 @@ static void xilinx_dma_issue_pending(struct dma_chan *dchan)
16571657
spin_unlock_irqrestore(&chan->lock, flags);
16581658
}
16591659

1660+
/**
1661+
* xilinx_dma_device_config - Configure the DMA channel
1662+
* @dchan: DMA channel
1663+
* @config: channel configuration
1664+
*/
1665+
static int xilinx_dma_device_config(struct dma_chan *dchan,
1666+
struct dma_slave_config *config)
1667+
{
1668+
return 0;
1669+
}
1670+
16601671
/**
16611672
* xilinx_dma_complete_descriptor - Mark the active descriptor as complete
16621673
* @chan : xilinx DMA channel
@@ -3095,6 +3106,7 @@ static int xilinx_dma_probe(struct platform_device *pdev)
30953106
xdev->common.device_synchronize = xilinx_dma_synchronize;
30963107
xdev->common.device_tx_status = xilinx_dma_tx_status;
30973108
xdev->common.device_issue_pending = xilinx_dma_issue_pending;
3109+
xdev->common.device_config = xilinx_dma_device_config;
30983110
if (xdev->dma_config->dmatype == XDMA_TYPE_AXIDMA) {
30993111
dma_cap_set(DMA_CYCLIC, xdev->common.cap_mask);
31003112
xdev->common.device_prep_slave_sg = xilinx_dma_prep_slave_sg;

0 commit comments

Comments
 (0)