[alsa-devel] [PATCH 12/13] ASoC: Remove snd_soc_update_bits_locked()

Lars-Peter Clausen lars at metafoo.de
Tue Mar 18 09:02:15 CET 2014


There are no users of snd_soc_update_bits_locked() left and it is identical to
snd_soc_update_bits(). So it can be removed.

Signed-off-by: Lars-Peter Clausen <lars at metafoo.de>
---
 include/sound/soc.h |  3 ---
 sound/soc/soc-io.c  | 20 --------------------
 2 files changed, 23 deletions(-)

diff --git a/include/sound/soc.h b/include/sound/soc.h
index cb98cd6..4485688 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -465,9 +465,6 @@ static inline void snd_soc_jack_free_gpios(struct snd_soc_jack *jack, int count,
 /* codec register bit access */
 int snd_soc_update_bits(struct snd_soc_codec *codec, unsigned short reg,
 				unsigned int mask, unsigned int value);
-int snd_soc_update_bits_locked(struct snd_soc_codec *codec,
-			       unsigned short reg, unsigned int mask,
-			       unsigned int value);
 int snd_soc_test_bits(struct snd_soc_codec *codec, unsigned short reg,
 				unsigned int mask, unsigned int value);
 
diff --git a/sound/soc/soc-io.c b/sound/soc/soc-io.c
index 762bcbc..4b87e42 100644
--- a/sound/soc/soc-io.c
+++ b/sound/soc/soc-io.c
@@ -161,26 +161,6 @@ int snd_soc_update_bits(struct snd_soc_codec *codec, unsigned short reg,
 EXPORT_SYMBOL_GPL(snd_soc_update_bits);
 
 /**
- * snd_soc_update_bits_locked - update codec register bits
- * @codec: audio codec
- * @reg: codec register
- * @mask: register mask
- * @value: new value
- *
- * Writes new register value, and takes the codec mutex.
- *
- * Returns 1 for change else 0.
- */
-int snd_soc_update_bits_locked(struct snd_soc_codec *codec,
-			       unsigned short reg, unsigned int mask,
-			       unsigned int value)
-{
-	return snd_soc_component_update_bits(&codec->component, reg, mask,
-		value);
-}
-EXPORT_SYMBOL_GPL(snd_soc_update_bits_locked);
-
-/**
  * snd_soc_test_bits - test register for change
  * @codec: audio codec
  * @reg: codec register
-- 
1.8.0



More information about the Alsa-devel mailing list