summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorVinod Koul <vkoul@kernel.org>2018-12-31 19:31:25 +0530
committerVinod Koul <vkoul@kernel.org>2018-12-31 19:31:25 +0530
commit5f443256e3a1e22a0969878428bcfbd3639439d9 (patch)
tree994713f680242d22d66a1d1123d8c38b60d8ccc0 /drivers
parent7c2269e95883a2123dc5c273df54d6c9e05ab880 (diff)
parent35faaf0df42d285b40f8a6310afbe096720f7758 (diff)
Merge branch 'topic/coh' into for-linus
Diffstat (limited to 'drivers')
-rw-r--r--drivers/dma/coh901318.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/dma/coh901318.c b/drivers/dma/coh901318.c
index eebaba3d9e78..b69d66e44052 100644
--- a/drivers/dma/coh901318.c
+++ b/drivers/dma/coh901318.c
@@ -1802,13 +1802,10 @@ static struct dma_chan *coh901318_xlate(struct of_phandle_args *dma_spec,
static int coh901318_config(struct coh901318_chan *cohc,
struct coh901318_params *param)
{
- unsigned long flags;
const struct coh901318_params *p;
int channel = cohc->id;
void __iomem *virtbase = cohc->base->virtbase;
- spin_lock_irqsave(&cohc->lock, flags);
-
if (param)
p = param;
else
@@ -1828,8 +1825,6 @@ static int coh901318_config(struct coh901318_chan *cohc,
coh901318_set_conf(cohc, p->config);
coh901318_set_ctrl(cohc, p->ctrl_lli_last);
- spin_unlock_irqrestore(&cohc->lock, flags);
-
return 0;
}