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>

diff --git a/sound/soc/pxa/corgi.c b/sound/soc/pxa/corgi.c
index 1853d41034bfa0c17d752f6191e4346e1cc06725..b51f88002e623bda7e315a456f2604bb44f61e3c 100644 (file)
--- a/sound/soc/pxa/corgi.c
+++ b/sound/soc/pxa/corgi.c
@@ -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;
 }
 

diff --git a/sound/soc/pxa/magician.c b/sound/soc/pxa/magician.c
index aace19e0fe2c217f734dbd0164b4d242a93be1d1..aeb08f5f3e1cc3bea030f38aedf2d785d4653b81 100644 (file)
--- 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)
        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;
 }
 

diff --git a/sound/soc/pxa/poodle.c b/sound/soc/pxa/poodle.c
index c93e138d8dc3403f538c193d2bc1fc52794d9ad6..27c6c03bc5d7a9ef2b4ba1f3f75033777f1ecbb9 100644 (file)
--- a/sound/soc/pxa/poodle.c
+++ b/sound/soc/pxa/poodle.c
@@ -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;
 }
 

diff --git a/sound/soc/pxa/spitz.c b/sound/soc/pxa/spitz.c
index fc052d8247ff245aa6b5baead314ac893e77930c..0728c1eb780cbe053cbda4625877ac84ebfa6d0a 100644 (file)
--- a/sound/soc/pxa/spitz.c
+++ b/sound/soc/pxa/spitz.c
@@ -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;
 }
 

diff --git a/sound/soc/pxa/tosa.c b/sound/soc/pxa/tosa.c
index 1d9c2ed223bc089b233b748485c7b5a2e387ee49..d6f38d7ecc1c1143ad68891fda9024f853fef40f 100644 (file)
--- a/sound/soc/pxa/tosa.c
+++ b/sound/soc/pxa/tosa.c
@@ -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;
 }