evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ASoC: wm8903: Move the deemph lock to the driver level

Browse source 
The wm8903 uses the snd_soc_codec mutex to protect its deemph settings from
concurrent access. This patch moves this lock to the driver level. This will
allow us to eventually remove the snd_soc_codec mutex.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Lars-Peter Clausen 2014-11-09 17:01:01 +01:00 • committed by Mark Brown
parent a51ff30f45
commit 78660af7ba
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sound/soc/codecs/wm8903.c
View file

@ -26,6 +26,7 @@
#include <linux/regmap.h> #include <linux/regmap.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/mutex.h>
#include <sound/core.h> #include <sound/core.h>
#include <sound/jack.h> #include <sound/jack.h>
#include <sound/pcm.h> #include <sound/pcm.h>
@ -123,6 +124,7 @@ struct wm8903_priv {
int sysclk; int sysclk;
int irq; int irq;
struct mutex lock;
int fs; int fs;
int deemph; int deemph;
@ -457,7 +459,7 @@ static int wm8903_put_deemph(struct snd_kcontrol *kcontrol,
if (deemph > 1) if (deemph > 1)
return -EINVAL; return -EINVAL;
mutex_lock(&codec->mutex); mutex_lock(&wm8903->lock);
if (wm8903->deemph != deemph) { if (wm8903->deemph != deemph) {
wm8903->deemph = deemph; wm8903->deemph = deemph;
@ -465,7 +467,7 @@ static int wm8903_put_deemph(struct snd_kcontrol *kcontrol,
ret = 1; ret = 1;
} }
mutex_unlock(&codec->mutex); mutex_unlock(&wm8903->lock);
return ret; return ret;
} }
@ -2023,6 +2025,8 @@ static int wm8903_i2c_probe(struct i2c_client *i2c,
GFP_KERNEL); GFP_KERNEL);
if (wm8903 == NULL) if (wm8903 == NULL)
return -ENOMEM; return -ENOMEM;
mutex_init(&wm8903->lock);
wm8903->dev = &i2c->dev; wm8903->dev = &i2c->dev;
wm8903->regmap = devm_regmap_init_i2c(i2c, &wm8903_regmap); wm8903->regmap = devm_regmap_init_i2c(i2c, &wm8903_regmap);