ASoC: pxa: Remove superfluous locking
The locking here was added in commit71a295602e
("ASoC: Lock the CODEC in PXA external jack controls") to protect the DAPM changes that are made inside of ${board}_ext_control() against concurrent updates. The ASoC core was updated in commita73fb2df01
("ASoC: dapm: Use DAPM mutex for DAPM ops instead of codec mutex") to use a card wide lock rather the CODEC mutex to protect DAPM operations. We now have proper locking inside ${board}_ext_control() itself, so taking the CODEC lock can be removed. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
parent
38dbfb59d1
commit
9b87a5b0d4
|
@ -99,13 +99,9 @@ static int corgi_startup(struct snd_pcm_substream *substream)
|
|||
struct snd_soc_pcm_runtime *rtd = substream->private_data;
|
||||
struct snd_soc_codec *codec = rtd->codec;
|
||||
|
||||
mutex_lock(&codec->mutex);
|
||||
|
||||
/* check the jack status at stream startup */
|
||||
corgi_ext_control(&codec->dapm);
|
||||
|
||||
mutex_unlock(&codec->mutex);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
@ -73,13 +73,9 @@ static int magician_startup(struct snd_pcm_substream *substream)
|
|||
struct snd_soc_pcm_runtime *rtd = substream->private_data;
|
||||
struct snd_soc_codec *codec = rtd->codec;
|
||||
|
||||
mutex_lock(&codec->mutex);
|
||||
|
||||
/* check the jack status at stream startup */
|
||||
magician_ext_control(codec);
|
||||
|
||||
mutex_unlock(&codec->mutex);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
@ -76,13 +76,9 @@ static int poodle_startup(struct snd_pcm_substream *substream)
|
|||
struct snd_soc_pcm_runtime *rtd = substream->private_data;
|
||||
struct snd_soc_codec *codec = rtd->codec;
|
||||
|
||||
mutex_lock(&codec->mutex);
|
||||
|
||||
/* check the jack status at stream startup */
|
||||
poodle_ext_control(&codec->dapm);
|
||||
|
||||
mutex_unlock(&codec->mutex);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
@ -108,13 +108,9 @@ static int spitz_startup(struct snd_pcm_substream *substream)
|
|||
struct snd_soc_pcm_runtime *rtd = substream->private_data;
|
||||
struct snd_soc_codec *codec = rtd->codec;
|
||||
|
||||
mutex_lock(&codec->mutex);
|
||||
|
||||
/* check the jack status at stream startup */
|
||||
spitz_ext_control(&codec->dapm);
|
||||
|
||||
mutex_unlock(&codec->mutex);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
@ -80,13 +80,9 @@ static int tosa_startup(struct snd_pcm_substream *substream)
|
|||
struct snd_soc_pcm_runtime *rtd = substream->private_data;
|
||||
struct snd_soc_codec *codec = rtd->codec;
|
||||
|
||||
mutex_lock(&codec->mutex);
|
||||
|
||||
/* check the jack status at stream startup */
|
||||
tosa_ext_control(codec);
|
||||
|
||||
mutex_unlock(&codec->mutex);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue