summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Smith <alex.smith@imgtec.com>2015-07-24 18:24:23 +0200
committerVinod Koul <vinod.koul@intel.com>2015-08-18 18:58:49 +0200
commitd3273e10ad871e903456a875e1062514cd13a244 (patch)
tree69f4276a6a873a400c9b94c9161cfa5c0dfde728
parentdmaengine: jz4780: Fix error handling/signedness issues (diff)
downloadlinux-d3273e10ad871e903456a875e1062514cd13a244.tar.xz
linux-d3273e10ad871e903456a875e1062514cd13a244.zip
dmaengine: jz4780: Use dma_get_slave_channel when requesting a specific channel
When the DT requests a specific channel to use it is not necesssary to scan through all DMA channels in the system. Just return the requested channel using dma_get_slave_channel(). Signed-off-by: Alex Smith <alex.smith@imgtec.com> Cc: Vinod Koul <vinod.koul@intel.com> Cc: Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com> Cc: dmaengine@vger.kernel.org Signed-off-by: Vinod Koul <vinod.koul@intel.com>
-rw-r--r--drivers/dma/dma-jz4780.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/dma/dma-jz4780.c b/drivers/dma/dma-jz4780.c
index e4a291c67e2a..40baaf00b971 100644
--- a/drivers/dma/dma-jz4780.c
+++ b/drivers/dma/dma-jz4780.c
@@ -726,9 +726,14 @@ static struct dma_chan *jz4780_of_dma_xlate(struct of_phandle_args *dma_spec,
data.channel);
return NULL;
}
- }
- return dma_request_channel(mask, jz4780_dma_filter_fn, &data);
+ jzdma->chan[data.channel].transfer_type = data.transfer_type;
+
+ return dma_get_slave_channel(
+ &jzdma->chan[data.channel].vchan.chan);
+ } else {
+ return dma_request_channel(mask, jz4780_dma_filter_fn, &data);
+ }
}
static int jz4780_dma_probe(struct platform_device *pdev)