summaryrefslogtreecommitdiffstats
path: root/sound/soc/pxa
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2014-02-22 18:44:17 +0100
committerMark Brown <broonie@linaro.org>2014-02-23 10:51:05 +0900
commit9b87a5b0d4aad02e9dff299b63cd85930eb233d8 (patch)
tree8ea69539c37d0dbdda7a64675093d345213a152c /sound/soc/pxa
parent38dbfb59d1175ef458d006556061adeaa8751b72 (diff)
downloadop-kernel-dev-9b87a5b0d4aad02e9dff299b63cd85930eb233d8.zip
op-kernel-dev-9b87a5b0d4aad02e9dff299b63cd85930eb233d8.tar.gz
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')
-rw-r--r--sound/soc/pxa/corgi.c4
-rw-r--r--sound/soc/pxa/magician.c4
-rw-r--r--sound/soc/pxa/poodle.c4
-rw-r--r--sound/soc/pxa/spitz.c4
-rw-r--r--sound/soc/pxa/tosa.c4
5 files changed, 0 insertions, 20 deletions
diff --git a/sound/soc/pxa/corgi.c b/sound/soc/pxa/corgi.c
index 1853d41..b51f880 100644
--- 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 aace19e..aeb08f5 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)
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 c93e138..27c6c03 100644
--- 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 fc052d8..0728c1eb 100644
--- 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 1d9c2ed..d6f38d7 100644
--- 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;
}
OpenPOWER on IntegriCloud