Commit 3e4199ef authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown
Browse files

ASoC: wm8962: Move DSP enable lock to the driver level 



The wm8962 uses the snd_soc_codec mutex to protect the wm8962_dsp2_ena_put()
function from concurrent execution. This patch moves that lock to the driver
level. This will allow us to eventually remove the snd_soc_codec mutex.

Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Acked-by: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent fabfad2f

sound/soc/codecs/wm8962.c

+6 −2
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <linux/regulator/consumer.h>

#include <linux/slab.h>

#include <linux/workqueue.h>

#include <linux/mutex.h>

#include <sound/core.h>

#include <sound/jack.h>

#include <sound/pcm.h>
@@ -67,6 +68,7 @@ struct wm8962_priv { 
	int fll_fref;

	int fll_fout;



	struct mutex dsp2_ena_lock;

	u16 dsp2_ena;



	struct delayed_work mic_work;
@@ -1570,7 +1572,7 @@ static int wm8962_dsp2_ena_put(struct snd_kcontrol *kcontrol, 
	int dsp2_running = snd_soc_read(codec, WM8962_DSP2_POWER_MANAGEMENT) &

		WM8962_DSP2_ENA;



	mutex_lock(&codec->mutex);

	mutex_lock(&wm8962->dsp2_ena_lock);



	if (ucontrol->value.integer.value[0])

		wm8962->dsp2_ena |= 1 << shift;
@@ -1590,7 +1592,7 @@ static int wm8962_dsp2_ena_put(struct snd_kcontrol *kcontrol, 
	}



out:

	mutex_unlock(&codec->mutex);

	mutex_unlock(&wm8962->dsp2_ena_lock);



	return ret;

}
@@ -3557,6 +3559,8 @@ static int wm8962_i2c_probe(struct i2c_client *i2c, 
	if (wm8962 == NULL)

		return -ENOMEM;



	mutex_init(&wm8962->dsp2_ena_lock);



	i2c_set_clientdata(i2c, wm8962);



	INIT_DELAYED_WORK(&wm8962->mic_work, wm8962_mic_work);

CRA Git | Maintained and supported by SUSTech CRA and CCSE