aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2009-12-04 09:22:03 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-12-04 11:07:06 -0500
commitdd1b3d53c2e5b9cccec9001fc0b63f6b686a4ac9 (patch)
tree6a1f9e150fb2d7fbf69326b50e05b44801e3deb7
parent3a7aaed714bbe3c071000d720f0cce186d1897a4 (diff)
ASoC: Export snd_soc_update_bits_unlocked()
Allows custom controls to use it. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
-rw-r--r--include/sound/soc.h3
-rw-r--r--sound/soc/soc-core.c7
2 files changed, 7 insertions, 3 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h
index 0d7718f9280d..08909ccd235b 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -253,6 +253,9 @@ void snd_soc_jack_free_gpios(struct snd_soc_jack *jack, int count,
253/* codec register bit access */ 253/* codec register bit access */
254int snd_soc_update_bits(struct snd_soc_codec *codec, unsigned short reg, 254int snd_soc_update_bits(struct snd_soc_codec *codec, unsigned short reg,
255 unsigned int mask, unsigned int value); 255 unsigned int mask, unsigned int value);
256int snd_soc_update_bits_locked(struct snd_soc_codec *codec,
257 unsigned short reg, unsigned int mask,
258 unsigned int value);
256int snd_soc_test_bits(struct snd_soc_codec *codec, unsigned short reg, 259int snd_soc_test_bits(struct snd_soc_codec *codec, unsigned short reg,
257 unsigned int mask, unsigned int value); 260 unsigned int mask, unsigned int value);
258 261
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index ef8f28284cb9..8b900a842677 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1427,9 +1427,9 @@ EXPORT_SYMBOL_GPL(snd_soc_update_bits);
1427 * 1427 *
1428 * Returns 1 for change else 0. 1428 * Returns 1 for change else 0.
1429 */ 1429 */
1430static int snd_soc_update_bits_locked(struct snd_soc_codec *codec, 1430int snd_soc_update_bits_locked(struct snd_soc_codec *codec,
1431 unsigned short reg, unsigned int mask, 1431 unsigned short reg, unsigned int mask,
1432 unsigned int value) 1432 unsigned int value)
1433{ 1433{
1434 int change; 1434 int change;
1435 1435
@@ -1439,6 +1439,7 @@ static int snd_soc_update_bits_locked(struct snd_soc_codec *codec,
1439 1439
1440 return change; 1440 return change;
1441} 1441}
1442EXPORT_SYMBOL_GPL(snd_soc_update_bits_locked);
1442 1443
1443/** 1444/**
1444 * snd_soc_test_bits - test register for change 1445 * snd_soc_test_bits - test register for change