ASoC: wm8971: 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>

1 files changed, 8 insertions, 19 deletions

diff --git a/sound/soc/codecs/wm8971.c b/sound/soc/codecs/wm8971.c
index 572bb80627a4..ce33a94b6aad 100644
--- 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));