diff options
author | Axel Lin <axel.lin@gmail.com> | 2011-10-03 21:59:26 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-10-04 07:03:49 -0400 |
commit | 9cd113261b7d38b96e6edac688790bb965e23566 (patch) | |
tree | 459070e9a825f6d4cbd5061a0d6a671b5918dd18 /sound/soc/codecs/wm8988.c | |
parent | c6d43417dd0ff6d4431f6f52e6eac1f48ff779b2 (diff) |
ASoC: wm8988: Use snd_soc_update_bits for read-modify-write
Use snd_soc_update_bits for read-modify-write register access instead of
open-coding it using snd_soc_read and snd_soc_write
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/codecs/wm8988.c')
-rw-r--r-- | sound/soc/codecs/wm8988.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/sound/soc/codecs/wm8988.c b/sound/soc/codecs/wm8988.c index d7170f1381aa..5099e62641d4 100644 --- a/sound/soc/codecs/wm8988.c +++ b/sound/soc/codecs/wm8988.c | |||
@@ -774,16 +774,11 @@ static int wm8988_probe(struct snd_soc_codec *codec) | |||
774 | } | 774 | } |
775 | 775 | ||
776 | /* set the update bits (we always update left then right) */ | 776 | /* set the update bits (we always update left then right) */ |
777 | reg = snd_soc_read(codec, WM8988_RADC); | 777 | snd_soc_update_bits(codec, WM8988_RADC, 0x0100, 0x0100); |
778 | snd_soc_write(codec, WM8988_RADC, reg | 0x100); | 778 | snd_soc_update_bits(codec, WM8988_RDAC, 0x0100, 0x0100); |
779 | reg = snd_soc_read(codec, WM8988_RDAC); | 779 | snd_soc_update_bits(codec, WM8988_ROUT1V, 0x0100, 0x0100); |
780 | snd_soc_write(codec, WM8988_RDAC, reg | 0x0100); | 780 | snd_soc_update_bits(codec, WM8988_ROUT2V, 0x0100, 0x0100); |
781 | reg = snd_soc_read(codec, WM8988_ROUT1V); | 781 | snd_soc_update_bits(codec, WM8988_RINVOL, 0x0100, 0x0100); |
782 | snd_soc_write(codec, WM8988_ROUT1V, reg | 0x0100); | ||
783 | reg = snd_soc_read(codec, WM8988_ROUT2V); | ||
784 | snd_soc_write(codec, WM8988_ROUT2V, reg | 0x0100); | ||
785 | reg = snd_soc_read(codec, WM8988_RINVOL); | ||
786 | snd_soc_write(codec, WM8988_RINVOL, reg | 0x0100); | ||
787 | 782 | ||
788 | wm8988_set_bias_level(codec, SND_SOC_BIAS_STANDBY); | 783 | wm8988_set_bias_level(codec, SND_SOC_BIAS_STANDBY); |
789 | 784 | ||