summaryrefslogtreecommitdiff
path: root/sound/soc/codecs/wm8580.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-08-13 20:57:28 +0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-08-15 17:51:21 +0400
commite231cab0a4b5844ae13a9584433ca3b9b204629e (patch)
treec19386d267f25796d8debd7226b134eb5675f9b9 /sound/soc/codecs/wm8580.c
parenteaae183f4b3f25522cd13ebf30162c1cb863b1f1 (diff)
downloadlinux-e231cab0a4b5844ae13a9584433ca3b9b204629e.tar.xz
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>
Diffstat (limited to 'sound/soc/codecs/wm8580.c')
-rw-r--r--sound/soc/codecs/wm8580.c6
1 files changed, 3 insertions, 3 deletions
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;
}