diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-08-13 12:57:28 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-08-15 09:51:21 -0400 |
commit | e231cab0a4b5844ae13a9584433ca3b9b204629e (patch) | |
tree | c19386d267f25796d8debd7226b134eb5675f9b9 /sound/soc/codecs/wm8580.c | |
parent | eaae183f4b3f25522cd13ebf30162c1cb863b1f1 (diff) |
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.c | 6 |
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, | |||
485 | { | 485 | { |
486 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | 486 | struct snd_soc_pcm_runtime *rtd = substream->private_data; |
487 | struct snd_soc_codec *codec = rtd->codec; | 487 | struct snd_soc_codec *codec = rtd->codec; |
488 | u16 paifb = snd_soc_read(codec, WM8580_PAIF3 + dai->driver->id); | 488 | u16 paifb = 0; |
489 | 489 | ||
490 | paifb &= ~WM8580_AIF_LENGTH_MASK; | ||
491 | /* bit size */ | 490 | /* bit size */ |
492 | switch (params_format(params)) { | 491 | switch (params_format(params)) { |
493 | case SNDRV_PCM_FORMAT_S16_LE: | 492 | case SNDRV_PCM_FORMAT_S16_LE: |
@@ -505,7 +504,8 @@ static int wm8580_paif_hw_params(struct snd_pcm_substream *substream, | |||
505 | return -EINVAL; | 504 | return -EINVAL; |
506 | } | 505 | } |
507 | 506 | ||
508 | snd_soc_write(codec, WM8580_PAIF3 + dai->driver->id, paifb); | 507 | snd_soc_update_bits(codec, WM8580_PAIF3 + dai->driver->id, |
508 | WM8580_AIF_LENGTH_MASK, paifb); | ||
509 | return 0; | 509 | return 0; |
510 | } | 510 | } |
511 | 511 | ||