[alsa-devel] [PATCH 05/17 v2] ASoC: adav80x: Update locking around use of DAPM pin API

[Lars-Peter Clausen]

On 02/18/2014 04:22 PM, Charles Keepax wrote:
> The pin updates in this driver look like they are intended to be done
> atomically, update to do so.
>
> Signed-off-by: Charles Keepax <ckeepax at opensource.wolfsonmicro.com>

Acked-by: Lars-Peter Clausen <lars at metafoo.de>

Thanks.

> ---
>   sound/soc/codecs/adav80x.c |   17 +++++++++++------
>   1 files changed, 11 insertions(+), 6 deletions(-)
>
> diff --git a/sound/soc/codecs/adav80x.c b/sound/soc/codecs/adav80x.c
> index 09d5609..9eb53c8 100644
> --- a/sound/soc/codecs/adav80x.c
> +++ b/sound/soc/codecs/adav80x.c
> @@ -539,6 +539,7 @@ static int adav80x_set_sysclk(struct snd_soc_codec *codec,
>   			      unsigned int freq, int dir)
>   {
>   	struct adav80x *adav80x = snd_soc_codec_get_drvdata(codec);
> +	struct snd_soc_dapm_context *dapm = &codec->dapm;
>
>   	if (dir == SND_SOC_CLOCK_IN) {
>   		switch (clk_id) {
> @@ -571,7 +572,7 @@ static int adav80x_set_sysclk(struct snd_soc_codec *codec,
>   			regmap_write(adav80x->regmap, ADAV80X_ICLK_CTRL2,
>   				iclk_ctrl2);
>
> -			snd_soc_dapm_sync(&codec->dapm);
> +			snd_soc_dapm_sync(dapm);
>   		}
>   	} else {
>   		unsigned int mask;
> @@ -598,17 +599,21 @@ static int adav80x_set_sysclk(struct snd_soc_codec *codec,
>   			adav80x->sysclk_pd[clk_id] = false;
>   		}
>
> +		snd_soc_dapm_mutex_lock(dapm);
> +
>   		if (adav80x->sysclk_pd[0])
> -			snd_soc_dapm_disable_pin(&codec->dapm, "PLL1");
> +			snd_soc_dapm_disable_pin_unlocked(dapm, "PLL1");
>   		else
> -			snd_soc_dapm_force_enable_pin(&codec->dapm, "PLL1");
> +			snd_soc_dapm_force_enable_pin_unlocked(dapm, "PLL1");
>
>   		if (adav80x->sysclk_pd[1] || adav80x->sysclk_pd[2])
> -			snd_soc_dapm_disable_pin(&codec->dapm, "PLL2");
> +			snd_soc_dapm_disable_pin_unlocked(dapm, "PLL2");
>   		else
> -			snd_soc_dapm_force_enable_pin(&codec->dapm, "PLL2");
> +			snd_soc_dapm_force_enable_pin_unlocked(dapm, "PLL2");
>
> -		snd_soc_dapm_sync(&codec->dapm);
> +		snd_soc_dapm_sync_unlocked(dapm);
> +
> +		snd_soc_dapm_mutex_unlock(dapm);
>   	}
>
>   	return 0;
>