| Message ID | 1399223826-28522-2-git-send-email-lars@metafoo.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Sun, May 04, 2014 at 07:17:06PM +0200, Lars-Peter Clausen wrote: > - /* Prepare for a STADDBY->ON or ON->STANDBY transition */ > - if (d->bias_level != d->target_bias_level) { > + /* Prepare for a transition to ON or away from ON */ > + if ((d->target_bias_level == SND_SOC_BIAS_ON && > + d->bias_level != SND_SOC_BIAS_ON) || > + (d->target_bias_level != SND_SOC_BIAS_ON && > + d->bias_level == SND_SOC_BIAS_ON)) { Can you fix the indentation so that the two sides of the or are lined up? It's a bit of a fiddly test and having the two cases not lined up makes it harder to read.
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 5d54dfc..562cea8 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -1549,8 +1549,11 @@ static void dapm_pre_sequence_async(void *data, async_cookie_t cookie) "ASoC: Failed to turn on bias: %d\n", ret); } - /* Prepare for a STADDBY->ON or ON->STANDBY transition */ - if (d->bias_level != d->target_bias_level) { + /* Prepare for a transition to ON or away from ON */ + if ((d->target_bias_level == SND_SOC_BIAS_ON && + d->bias_level != SND_SOC_BIAS_ON) || + (d->target_bias_level != SND_SOC_BIAS_ON && + d->bias_level == SND_SOC_BIAS_ON)) { ret = snd_soc_dapm_set_bias_level(d, SND_SOC_BIAS_PREPARE); if (ret != 0) dev_err(d->dev,
Currently when the DAPM context bias level is SUSPEND and the target bias level is OFF dapm_pre_sequence_async() will first transition to PREPARE and dapm_post_sequence_async() will then transition back from PREPARE to STANDBY and then to OFF. This patch makes sure that dapm_pre_sequence_async() only transitions to PREPARE when either going to ON or away from ON. This avoids the extra unnecessary transitions. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> --- Given that SUSPEND -> OFF transitions are rather rare and the code will still work correctly (but inefficent) without this patch, the patch probably does not need to go into stable. --- sound/soc/soc-dapm.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)