ASoC: wm8971: Use snd_soc_update_bits for read-modify-write

[deliverable/linux.git] / sound / soc / codecs / wm8971.c

diff --git a/sound/soc/codecs/wm8971.c b/sound/soc/codecs/wm8971.c
index 572bb80627a478b503ab7edfa78792e79423273e..ce33a94b6aadea919e9f6feec41d1871b6d35ae3 100644 (file)
--- a/sound/soc/codecs/wm8971.c
+++ b/sound/soc/codecs/wm8971.c
@@ -660,25 +660,14 @@ static int wm8971_probe(struct snd_soc_codec *codec)
                msecs_to_jiffies(1000));
 
        /* set the update bits */
-       reg = snd_soc_read(codec, WM8971_LDAC);
-       snd_soc_write(codec, WM8971_LDAC, reg | 0x0100);
-       reg = snd_soc_read(codec, WM8971_RDAC);
-       snd_soc_write(codec, WM8971_RDAC, reg | 0x0100);
-
-       reg = snd_soc_read(codec, WM8971_LOUT1V);
-       snd_soc_write(codec, WM8971_LOUT1V, reg | 0x0100);
-       reg = snd_soc_read(codec, WM8971_ROUT1V);
-       snd_soc_write(codec, WM8971_ROUT1V, reg | 0x0100);
-
-       reg = snd_soc_read(codec, WM8971_LOUT2V);
-       snd_soc_write(codec, WM8971_LOUT2V, reg | 0x0100);
-       reg = snd_soc_read(codec, WM8971_ROUT2V);
-       snd_soc_write(codec, WM8971_ROUT2V, reg | 0x0100);
-
-       reg = snd_soc_read(codec, WM8971_LINVOL);
-       snd_soc_write(codec, WM8971_LINVOL, reg | 0x0100);
-       reg = snd_soc_read(codec, WM8971_RINVOL);
-       snd_soc_write(codec, WM8971_RINVOL, reg | 0x0100);
+       snd_soc_update_bits(codec, WM8971_LDAC, 0x0100, 0x0100);
+       snd_soc_update_bits(codec, WM8971_RDAC, 0x0100, 0x0100);
+       snd_soc_update_bits(codec, WM8971_LOUT1V, 0x0100, 0x0100);
+       snd_soc_update_bits(codec, WM8971_ROUT1V, 0x0100, 0x0100);
+       snd_soc_update_bits(codec, WM8971_LOUT2V, 0x0100, 0x0100);
+       snd_soc_update_bits(codec, WM8971_ROUT2V, 0x0100, 0x0100);
+       snd_soc_update_bits(codec, WM8971_LINVOL, 0x0100, 0x0100);
+       snd_soc_update_bits(codec, WM8971_RINVOL, 0x0100, 0x0100);
 
        snd_soc_add_controls(codec, wm8971_snd_controls,
                                ARRAY_SIZE(wm8971_snd_controls));