aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/soc-core.c
diff options
context:
space:
mode:
authorEero Nurkkala <ext-eero.nurkkala@nokia.com>2009-10-30 07:34:02 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-10-30 13:49:12 -0400
commit8538a119bfb9031c402a33fc65c276ab9bfafdd5 (patch)
tree8d782ea40c68a433b318ad01aaea0448423dc7b5 /sound/soc/soc-core.c
parent98078bf90495729e59edbec088d00b9d98f4cc0f (diff)
ASoC: remove io_mutex
Remove the io_mutex. It has a drawback of serializing all accesses to snd_soc_update_bits() even when multiple codecs are in use. In addition, it fails to actually do its task - during snd_soc_update_bits(), dapm_update_bits() may also be accessing the same register which may result in an outdated register value. Signed-off-by: Eero Nurkkala <ext-eero.nurkkala@nokia.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/soc-core.c')
-rw-r--r--sound/soc/soc-core.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 2d190df9fccc..025c5a7f8b72 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -37,7 +37,6 @@
37#include <sound/initval.h> 37#include <sound/initval.h>
38 38
39static DEFINE_MUTEX(pcm_mutex); 39static DEFINE_MUTEX(pcm_mutex);
40static DEFINE_MUTEX(io_mutex);
41static DECLARE_WAIT_QUEUE_HEAD(soc_pm_waitq); 40static DECLARE_WAIT_QUEUE_HEAD(soc_pm_waitq);
42 41
43#ifdef CONFIG_DEBUG_FS 42#ifdef CONFIG_DEBUG_FS
@@ -1346,14 +1345,12 @@ int snd_soc_update_bits(struct snd_soc_codec *codec, unsigned short reg,
1346 int change; 1345 int change;
1347 unsigned int old, new; 1346 unsigned int old, new;
1348 1347
1349 mutex_lock(&io_mutex);
1350 old = snd_soc_read(codec, reg); 1348 old = snd_soc_read(codec, reg);
1351 new = (old & ~mask) | value; 1349 new = (old & ~mask) | value;
1352 change = old != new; 1350 change = old != new;
1353 if (change) 1351 if (change)
1354 snd_soc_write(codec, reg, new); 1352 snd_soc_write(codec, reg, new);
1355 1353
1356 mutex_unlock(&io_mutex);
1357 return change; 1354 return change;
1358} 1355}
1359EXPORT_SYMBOL_GPL(snd_soc_update_bits); 1356EXPORT_SYMBOL_GPL(snd_soc_update_bits);
@@ -1376,11 +1373,9 @@ int snd_soc_test_bits(struct snd_soc_codec *codec, unsigned short reg,
1376 int change; 1373 int change;
1377 unsigned int old, new; 1374 unsigned int old, new;
1378 1375
1379 mutex_lock(&io_mutex);
1380 old = snd_soc_read(codec, reg); 1376 old = snd_soc_read(codec, reg);
1381 new = (old & ~mask) | value; 1377 new = (old & ~mask) | value;
1382 change = old != new; 1378 change = old != new;
1383 mutex_unlock(&io_mutex);
1384 1379
1385 return change; 1380 return change;
1386} 1381}