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

index 8feb096786f81410546534bad1e852d07b1316d4..e95fa7dabc0c87a109673b2b3d9fda3ad3b31e40 100644 (file)
@@ -971,19 +971,6 @@ static void __init edma_chan_init(struct edma_cc *ecc,
                                 BIT(DMA_SLAVE_BUSWIDTH_3_BYTES) | \
                                 BIT(DMA_SLAVE_BUSWIDTH_4_BYTES))
 
-static int edma_dma_device_slave_caps(struct dma_chan *dchan,
-                                     struct dma_slave_caps *caps)
-{
-       caps->src_addr_widths = EDMA_DMA_BUSWIDTHS;
-       caps->dst_addr_widths = EDMA_DMA_BUSWIDTHS;
-       caps->directions = BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV);
-       caps->cmd_pause = true;
-       caps->cmd_terminate = true;
-       caps->residue_granularity = DMA_RESIDUE_GRANULARITY_BURST;
-
-       return 0;
-}
-
 static void edma_dma_init(struct edma_cc *ecc, struct dma_device *dma,
                          struct device *dev)
 {
@@ -998,7 +985,12 @@ static void edma_dma_init(struct edma_cc *ecc, struct dma_device *dma,
        dma->device_pause = edma_dma_pause;
        dma->device_resume = edma_dma_resume;
        dma->device_terminate_all = edma_terminate_all;
-       dma->device_slave_caps = edma_dma_device_slave_caps;
+
+       dma->src_addr_widths = EDMA_DMA_BUSWIDTHS;
+       dma->dst_addr_widths = EDMA_DMA_BUSWIDTHS;
+       dma->directions = BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV);
+       dma->residue_granularity = DMA_RESIDUE_GRANULARITY_BURST;
+
        dma->dev = dev;
 
        /*