system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-09-20 11:07:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

ASoC: twl6040: Simplify code in out_drv_event for pending work check

Browse source 
Instead of checking, if the work is pending, it is safer to cancel
the pending work, or wait till the scheduled work finishes.
This way we can avoid modifying the variables used by the work
function.
Since we know that no work is pending, we can remove the two additional
checks in POST_PMU, and PRE_PMD for non pending works.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Peter Ujfalusi 2011-09-29 15:22:37 +03:00 committed by Mark Brown
parent 6fbb32d175
commit 009d196b47
1 changed files with 22 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
sound/soc/codecs/twl6040.c
View file

@ -565,12 +565,26 @@ static int out_drv_event(struct snd_soc_dapm_widget *w,
switch (w->shift) { switch (w->shift) {
case 2: /* Headset output driver */ case 2: /* Headset output driver */
out = &priv->headset; out = &priv->headset;
work = &out->work;
/*
* Make sure, that we do not mess up variables for already
* executing work.
*/
cancel_delayed_work_sync(work);
out->left_step = priv->hs_left_step; out->left_step = priv->hs_left_step;
out->right_step = priv->hs_right_step; out->right_step = priv->hs_right_step;
out->step_delay = 5; /* 5 ms between volume ramp steps */ out->step_delay = 5; /* 5 ms between volume ramp steps */
break; break;
case 4: /* Handsfree output driver */ case 4: /* Handsfree output driver */
out = &priv->handsfree; out = &priv->handsfree;
work = &out->work;
/*
* Make sure, that we do not mess up variables for already
* executing work.
*/
cancel_delayed_work_sync(work);
out->left_step = priv->hf_left_step; out->left_step = priv->hf_left_step;
out->right_step = priv->hf_right_step; out->right_step = priv->hf_right_step;
out->step_delay = 5; /* 5 ms between volume ramp steps */ out->step_delay = 5; /* 5 ms between volume ramp steps */
@ -583,39 +597,31 @@ static int out_drv_event(struct snd_soc_dapm_widget *w,
return -1; return -1;
} }
work = &out->work;
switch (event) { switch (event) {
case SND_SOC_DAPM_POST_PMU: case SND_SOC_DAPM_POST_PMU:
if (out->active) if (out->active)
break; break;
/* don't use volume ramp for power-up */ /* don't use volume ramp for power-up */
out->ramp = TWL6040_RAMP_UP;
out->left_step = out->left_vol; out->left_step = out->left_vol;
out->right_step = out->right_vol; out->right_step = out->right_vol;
if (!delayed_work_pending(work)) { queue_delayed_work(priv->workqueue, work, msecs_to_jiffies(1));
out->ramp = TWL6040_RAMP_UP;
queue_delayed_work(priv->workqueue, work,
msecs_to_jiffies(1));
}
break; break;
case SND_SOC_DAPM_PRE_PMD: case SND_SOC_DAPM_PRE_PMD:
if (!out->active) if (!out->active)
break; break;
if (!delayed_work_pending(work)) { /* use volume ramp for power-down */
/* use volume ramp for power-down */ out->ramp = TWL6040_RAMP_DOWN;
out->ramp = TWL6040_RAMP_DOWN; INIT_COMPLETION(out->ramp_done);
INIT_COMPLETION(out->ramp_done);
queue_delayed_work(priv->workqueue, work, queue_delayed_work(priv->workqueue, work, msecs_to_jiffies(1));
msecs_to_jiffies(1));
wait_for_completion_timeout(&out->ramp_done, wait_for_completion_timeout(&out->ramp_done,
msecs_to_jiffies(2000)); msecs_to_jiffies(2000));
}
break; break;
} }