ASoC: Refactor symmetric_rates check to reduce indentation
PATCH 1/2 ASoC: Refactor symmetric_rates check to reduce indentation
Signed-off-by Mark Brown <[email protected]>
--- sound/soc/soc-core.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-)
sound/soc/soc-core.c +14 -14
@@ -500,20 +500,20 @@ static int soc_pcm_apply_symmetry(struct snd_pcm_substream *substream)struct snd_soc_dai *codec_dai = rtd->codec_dai;int ret; -if (codec_dai->driver->symmetric_rates || cpu_dai->driver->symmetric_rates || - rtd->dai_link->symmetric_rates) { -dev_dbg (&rtd->dev,"Symmetry forces %dHz rate\n" , - rtd->rate); - - ret =snd_pcm_hw_constraint_minmax (substream->runtime, -SNDRV_PCM_HW_PARAM_RATE , - rtd->rate, - rtd->rate); -if (ret <0 ) { -dev_err (&rtd->dev, -"Unable to apply rate symmetry constraint: %d\n" , ret); -return ret; - } +if (!codec_dai->driver->symmetric_rates && + !cpu_dai->driver->symmetric_rates && + !rtd->dai_link->symmetric_rates) +return 0 ; + +dev_dbg (&rtd->dev,"Symmetry forces %dHz rate\n" , rtd->rate); + + ret =snd_pcm_hw_constraint_minmax (substream->runtime, +SNDRV_PCM_HW_PARAM_RATE , + rtd->rate, rtd->rate); +if (ret <0 ) { +dev_err (&rtd->dev, +"Unable to apply rate symmetry constraint: %d\n" , ret); +return ret; }return 0 ;
Signature · 1 line
1.7.2.3
PATCH 2/2 ASoC: Warn rather than set a silly constraint when we can't do symmetry
Symmetric rate configuration can fail if the second stream starting tries to apply the symmetric constraint before the first stream has got far enough to pick a rate. Rather than try to enforce a nonsensical rate of 0Hz log a warning and allow the application to carry on. Things might go wrong later on but the user will know about it and there's unlikely to be lasting damage.
Signed-off-by Mark Brown <[email protected]>
--- sound/soc/soc-core.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-)
sound/soc/soc-core.c +10 -0
@@ -505,6 +505,16 @@ static int soc_pcm_apply_symmetry(struct snd_pcm_substream *substream) !rtd->dai_link->symmetric_rates)return 0 ; +/* This can happen if multiple streams are starting simultaneously - +* the second can need to get its constraints before the first has +* picked a rate. Complain and allow the application to carry on. +*/ +if (!rtd->rate) { +dev_warn (&rtd->dev, +"Not enforcing symmetric_rates due to race\n" ); +return 0 ; + } +dev_dbg (&rtd->dev,"Symmetry forces %dHz rate\n" , rtd->rate); ret = snd_pcm_hw_constraint_minmax(substream->runtime,
Signature · 1 line
1.7.2.3
Quoted 4 lines · Mark Brown
Signed-off-by Mark Brown <[email protected]>--- sound/soc/soc-core.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-)
Both
Acked-by Liam Girdwood <[email protected]>