OSDN Git Service

dmaengine: fsl-edma: Declare slave capabilities for the generic code
authorMaxime Ripard <maxime.ripard@free-electrons.com>
Mon, 17 Nov 2014 13:42:46 +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/fsl-edma.c

index d96a4af..09e2842 100644 (file)
@@ -787,18 +787,6 @@ static void fsl_edma_free_chan_resources(struct dma_chan *chan)
        fsl_chan->tcd_pool = NULL;
 }
 
-static int fsl_dma_device_slave_caps(struct dma_chan *dchan,
-               struct dma_slave_caps *caps)
-{
-       caps->src_addr_widths = FSL_EDMA_BUSWIDTHS;
-       caps->dst_addr_widths = FSL_EDMA_BUSWIDTHS;
-       caps->directions = BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV);
-       caps->cmd_pause = true;
-       caps->cmd_terminate = true;
-
-       return 0;
-}
-
 static int
 fsl_edma_irq_init(struct platform_device *pdev, struct fsl_edma_engine *fsl_edma)
 {
@@ -929,7 +917,10 @@ static int fsl_edma_probe(struct platform_device *pdev)
        fsl_edma->dma_dev.device_resume = fsl_edma_resume;
        fsl_edma->dma_dev.device_terminate_all = fsl_edma_terminate_all;
        fsl_edma->dma_dev.device_issue_pending = fsl_edma_issue_pending;
-       fsl_edma->dma_dev.device_slave_caps = fsl_dma_device_slave_caps;
+
+       fsl_edma->dma_dev.src_addr_widths = FSL_EDMA_BUSWIDTHS;
+       fsl_edma->dma_dev.dst_addr_widths = FSL_EDMA_BUSWIDTHS;
+       fsl_edma->dma_dev.directions = BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV);
 
        platform_set_drvdata(pdev, fsl_edma);