ASoC: Convert WM8580 hw_params to use snd_soc_update_bits()
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 13 Aug 2010 16:57:28 +0000 (17:57 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 15 Aug 2010 13:51:21 +0000 (14:51 +0100)
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>
sound/soc/codecs/wm8580.c

index b1a80e5ff8b5f4704ff07f692ef41ae7520d81ef..4f414199d76d06e41448e4105999d4e7389f0bc7 100644 (file)
@@ -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;
 }