ASoC: wm8731: Move the deemph lock to the driver level
The wm8731 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:
parent
d74bcaaeb6
commit
a51ff30f45
|
@ -24,6 +24,7 @@
|
||||||
#include <linux/regulator/consumer.h>
|
#include <linux/regulator/consumer.h>
|
||||||
#include <linux/spi/spi.h>
|
#include <linux/spi/spi.h>
|
||||||
#include <linux/of_device.h>
|
#include <linux/of_device.h>
|
||||||
|
#include <linux/mutex.h>
|
||||||
#include <sound/core.h>
|
#include <sound/core.h>
|
||||||
#include <sound/pcm.h>
|
#include <sound/pcm.h>
|
||||||
#include <sound/pcm_params.h>
|
#include <sound/pcm_params.h>
|
||||||
|
@ -50,6 +51,8 @@ struct wm8731_priv {
|
||||||
int sysclk_type;
|
int sysclk_type;
|
||||||
int playback_fs;
|
int playback_fs;
|
||||||
bool deemph;
|
bool deemph;
|
||||||
|
|
||||||
|
struct mutex lock;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
@ -138,7 +141,7 @@ static int wm8731_put_deemph(struct snd_kcontrol *kcontrol,
|
||||||
if (deemph > 1)
|
if (deemph > 1)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
mutex_lock(&codec->mutex);
|
mutex_lock(&wm8731->lock);
|
||||||
if (wm8731->deemph != deemph) {
|
if (wm8731->deemph != deemph) {
|
||||||
wm8731->deemph = deemph;
|
wm8731->deemph = deemph;
|
||||||
|
|
||||||
|
@ -146,7 +149,7 @@ static int wm8731_put_deemph(struct snd_kcontrol *kcontrol,
|
||||||
|
|
||||||
ret = 1;
|
ret = 1;
|
||||||
}
|
}
|
||||||
mutex_unlock(&codec->mutex);
|
mutex_unlock(&wm8731->lock);
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
@ -685,6 +688,8 @@ static int wm8731_spi_probe(struct spi_device *spi)
|
||||||
if (wm8731 == NULL)
|
if (wm8731 == NULL)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
||||||
|
mutex_init(&wm8731->lock);
|
||||||
|
|
||||||
wm8731->regmap = devm_regmap_init_spi(spi, &wm8731_regmap);
|
wm8731->regmap = devm_regmap_init_spi(spi, &wm8731_regmap);
|
||||||
if (IS_ERR(wm8731->regmap)) {
|
if (IS_ERR(wm8731->regmap)) {
|
||||||
ret = PTR_ERR(wm8731->regmap);
|
ret = PTR_ERR(wm8731->regmap);
|
||||||
|
|
Loading…
Reference in a new issue