diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-01-28 21:45:38 +0100 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2014-01-29 17:38:57 +0530 |
| commit | 15cec530e4bc7bed3f51cde8404f96fd28a8c7c5 (patch) | |
| tree | 731235fab2ca0bef5ef782deeb8d1421cf39dbb4 /drivers/dma | |
| parent | 6d05c9fabfdc8642b42a1000cd092b2a7543d85f (diff) | |
| download | op-kernel-dev-15cec530e4bc7bed3f51cde8404f96fd28a8c7c5.zip op-kernel-dev-15cec530e4bc7bed3f51cde8404f96fd28a8c7c5.tar.gz | |
dmaengine: mmp_pdma: fix mismerge
The merge between 2b7f65b11d87f "mmp_pdma: Style neatening" and
8010dad55a0ab0 "dma: add dma_get_any_slave_channel(), for use in of_xlate()"
caused a build error by leaving obsolete code in place:
mmp_pdma.c: In function 'mmp_pdma_dma_xlate':
mmp_pdma.c:909:31: error: 'candidate' undeclared
mmp_pdma.c:912:3: error: label 'retry' used but not defined
mmp_pdma.c:901:24: warning: unused variable 'c' [-Wunused-variable]
This removes the extraneous lines.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'drivers/dma')
| -rw-r--r-- | drivers/dma/mmp_pdma.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/dma/mmp_pdma.c b/drivers/dma/mmp_pdma.c index c1b7c3a..b439679 100644 --- a/drivers/dma/mmp_pdma.c +++ b/drivers/dma/mmp_pdma.c @@ -899,19 +899,11 @@ static struct dma_chan *mmp_pdma_dma_xlate(struct of_phandle_args *dma_spec, { struct mmp_pdma_device *d = ofdma->of_dma_data; struct dma_chan *chan; - struct mmp_pdma_chan *c; chan = dma_get_any_slave_channel(&d->device); if (!chan) return NULL; - /* dma_get_slave_channel will return NULL if we lost a race between - * the lookup and the reservation */ - chan = dma_get_slave_channel(candidate); - - if (!chan) - goto retry; - to_mmp_pdma_chan(chan)->drcmr = dma_spec->args[0]; return chan; |
