diff options
| author | Maxime Ripard <maxime.ripard@free-electrons.com> | 2014-11-17 14:42:48 +0100 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2014-12-22 12:33:23 +0530 |
| commit | 03526d3a67fd2f171f56ce0576d1b7b76ae7e23e (patch) | |
| tree | 2cb53e264c5849b6010fdcb92283054c02b65c2a /drivers/dma/nbpfaxi.c | |
| parent | 9f59cd0519c3b68bae7d9bef65d32722ce653a93 (diff) | |
| download | linux-stable-03526d3a67fd2f171f56ce0576d1b7b76ae7e23e.tar.gz linux-stable-03526d3a67fd2f171f56ce0576d1b7b76ae7e23e.tar.bz2 linux-stable-03526d3a67fd2f171f56ce0576d1b7b76ae7e23e.zip | |
dmaengine: nbpfaxi: Declare slave capabilities for the generic code
Now that the generic slave caps code can make use of the device assigned
capabilities, instead of relying on a callback to be implemented.
Make use of this code.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'drivers/dma/nbpfaxi.c')
| -rw-r--r-- | drivers/dma/nbpfaxi.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/drivers/dma/nbpfaxi.c b/drivers/dma/nbpfaxi.c index 0202602597f7..46c013b527cd 100644 --- a/drivers/dma/nbpfaxi.c +++ b/drivers/dma/nbpfaxi.c @@ -1069,18 +1069,6 @@ static void nbpf_free_chan_resources(struct dma_chan *dchan) } } -static int nbpf_slave_caps(struct dma_chan *dchan, - struct dma_slave_caps *caps) -{ - caps->src_addr_widths = NBPF_DMA_BUSWIDTHS; - caps->dst_addr_widths = NBPF_DMA_BUSWIDTHS; - caps->directions = BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV); - caps->cmd_pause = false; - caps->cmd_terminate = true; - - return 0; -} - static struct dma_chan *nbpf_of_xlate(struct of_phandle_args *dma_spec, struct of_dma *ofdma) { @@ -1411,7 +1399,6 @@ static int nbpf_probe(struct platform_device *pdev) dma_dev->device_prep_dma_memcpy = nbpf_prep_memcpy; dma_dev->device_tx_status = nbpf_tx_status; dma_dev->device_issue_pending = nbpf_issue_pending; - dma_dev->device_slave_caps = nbpf_slave_caps; /* * If we drop support for unaligned MEMCPY buffer addresses and / or @@ -1427,6 +1414,10 @@ static int nbpf_probe(struct platform_device *pdev) dma_dev->device_pause = nbpf_pause; dma_dev->device_terminate_all = nbpf_terminate_all; + dma_dev->src_addr_widths = NBPF_DMA_BUSWIDTHS; + dma_dev->dst_addr_widths = NBPF_DMA_BUSWIDTHS; + dma_dev->directions = BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV); + platform_set_drvdata(pdev, nbpf); ret = clk_prepare_enable(nbpf->clk); |