dmaengine: nbpfaxi: Declare slave capabilities for the generic code
authorMaxime Ripard <maxime.ripard@free-electrons.com>
Mon, 17 Nov 2014 13:42:48 +0000 (14:42 +0100)
committerVinod Koul <vinod.koul@intel.com>
Mon, 22 Dec 2014 07:03:23 +0000 (12:33 +0530)
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>
drivers/dma/nbpfaxi.c

index 0202602597f7a227b3e3530998416d6d001690a3..46c013b527cd157b9d1c6bb25446fffddcd715d6 100644 (file)
@@ -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);