From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Fri, 13 Aug 2010 16:57:28 +0000 (+0100)
Subject: ASoC: Convert WM8580 hw_params to use snd_soc_update_bits()
X-Git-Tag: firefly_0821_release~3680^2~2691^2~1226^2~491
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e231cab0a4b5844ae13a9584433ca3b9b204629e;p=firefly-linux-kernel-4.4.55.git

ASoC: Convert WM8580 hw_params to use snd_soc_update_bits()

All the cool kids are using snd_soc_update_bits() these days.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
---

diff --git a/sound/soc/codecs/wm8580.c b/sound/soc/codecs/wm8580.c
index b1a80e5ff8b5..4f414199d76d 100644
--- a/sound/soc/codecs/wm8580.c
+++ b/sound/soc/codecs/wm8580.c
@@ -485,9 +485,8 @@ static int wm8580_paif_hw_params(struct snd_pcm_substream *substream,
 {
 	struct snd_soc_pcm_runtime *rtd = substream->private_data;
 	struct snd_soc_codec *codec = rtd->codec;
-	u16 paifb = snd_soc_read(codec, WM8580_PAIF3 + dai->driver->id);
+	u16 paifb = 0;
 
-	paifb &= ~WM8580_AIF_LENGTH_MASK;
 	/* bit size */
 	switch (params_format(params)) {
 	case SNDRV_PCM_FORMAT_S16_LE:
@@ -505,7 +504,8 @@ static int wm8580_paif_hw_params(struct snd_pcm_substream *substream,
 		return -EINVAL;
 	}
 
-	snd_soc_write(codec, WM8580_PAIF3 + dai->driver->id, paifb);
+	snd_soc_update_bits(codec, WM8580_PAIF3 + dai->driver->id,
+			    WM8580_AIF_LENGTH_MASK, paifb);
 	return 0;
 }