diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2014-02-22 12:44:17 -0500 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-02-22 20:51:05 -0500 |
commit | 9b87a5b0d4aad02e9dff299b63cd85930eb233d8 (patch) | |
tree | 8ea69539c37d0dbdda7a64675093d345213a152c /sound/soc/pxa/magician.c | |
parent | 38dbfb59d1175ef458d006556061adeaa8751b72 (diff) |
ASoC: pxa: Remove superfluous locking
The locking here was added in commit 71a295602e ("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
commit a73fb2df01 ("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>
Diffstat (limited to 'sound/soc/pxa/magician.c')
-rw-r--r-- | sound/soc/pxa/magician.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sound/soc/pxa/magician.c b/sound/soc/pxa/magician.c index aace19e0fe2c..aeb08f5f3e1c 100644 --- a/sound/soc/pxa/magician.c +++ b/sound/soc/pxa/magician.c | |||
@@ -73,13 +73,9 @@ static int magician_startup(struct snd_pcm_substream *substream) | |||
73 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | 73 | struct snd_soc_pcm_runtime *rtd = substream->private_data; |
74 | struct snd_soc_codec *codec = rtd->codec; | 74 | struct snd_soc_codec *codec = rtd->codec; |
75 | 75 | ||
76 | mutex_lock(&codec->mutex); | ||
77 | |||
78 | /* check the jack status at stream startup */ | 76 | /* check the jack status at stream startup */ |
79 | magician_ext_control(codec); | 77 | magician_ext_control(codec); |
80 | 78 | ||
81 | mutex_unlock(&codec->mutex); | ||
82 | |||
83 | return 0; | 79 | return 0; |
84 | } | 80 | } |
85 | 81 | ||