forked from luck/tmp_suning_uos_patched
Merge branch 'topic/coh' into for-linus
This commit is contained in:
commit
5f443256e3
|
@ -1802,13 +1802,10 @@ static struct dma_chan *coh901318_xlate(struct of_phandle_args *dma_spec,
|
||||||
static int coh901318_config(struct coh901318_chan *cohc,
|
static int coh901318_config(struct coh901318_chan *cohc,
|
||||||
struct coh901318_params *param)
|
struct coh901318_params *param)
|
||||||
{
|
{
|
||||||
unsigned long flags;
|
|
||||||
const struct coh901318_params *p;
|
const struct coh901318_params *p;
|
||||||
int channel = cohc->id;
|
int channel = cohc->id;
|
||||||
void __iomem *virtbase = cohc->base->virtbase;
|
void __iomem *virtbase = cohc->base->virtbase;
|
||||||
|
|
||||||
spin_lock_irqsave(&cohc->lock, flags);
|
|
||||||
|
|
||||||
if (param)
|
if (param)
|
||||||
p = param;
|
p = param;
|
||||||
else
|
else
|
||||||
|
@ -1828,8 +1825,6 @@ static int coh901318_config(struct coh901318_chan *cohc,
|
||||||
coh901318_set_conf(cohc, p->config);
|
coh901318_set_conf(cohc, p->config);
|
||||||
coh901318_set_ctrl(cohc, p->ctrl_lli_last);
|
coh901318_set_ctrl(cohc, p->ctrl_lli_last);
|
||||||
|
|
||||||
spin_unlock_irqrestore(&cohc->lock, flags);
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user