Commit c6d43417 authored by Axel Lin's avatar Axel Lin Committed by Mark Brown
Browse files

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: default avatarAxel Lin <axel.lin@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 11b9ce62

sound/soc/codecs/wm8971.c

+8 −19
Original line number Diff line number Diff line
@@ -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));