aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-07-31 07:53:57 -0400
committerMark Brown <broonie@linaro.org>2014-07-31 13:48:09 -0400
commita4c8261d0b1a4f0d95de9fb3b56d201ad941e7f1 (patch)
tree30a1ab47df308169e4f0cae021dfd6077bcc9701 /sound
parent6afdc9a0e7062a804a47c4a21d775e29b864d367 (diff)
ASoC: wm8978: Convert to params_width()
The CODEC doesn't care how data is laid out in memory. Signed-off-by: Mark Brown <broonie@linaro.org> Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/wm8978.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/sound/soc/codecs/wm8978.c b/sound/soc/codecs/wm8978.c
index 28ef46c91f62..ee2ba574952b 100644
--- a/sound/soc/codecs/wm8978.c
+++ b/sound/soc/codecs/wm8978.c
@@ -736,16 +736,16 @@ static int wm8978_hw_params(struct snd_pcm_substream *substream,
736 return -EINVAL; 736 return -EINVAL;
737 737
738 /* bit size */ 738 /* bit size */
739 switch (params_format(params)) { 739 switch (params_width(params)) {
740 case SNDRV_PCM_FORMAT_S16_LE: 740 case 16:
741 break; 741 break;
742 case SNDRV_PCM_FORMAT_S20_3LE: 742 case 20:
743 iface_ctl |= 0x20; 743 iface_ctl |= 0x20;
744 break; 744 break;
745 case SNDRV_PCM_FORMAT_S24_LE: 745 case 24:
746 iface_ctl |= 0x40; 746 iface_ctl |= 0x40;
747 break; 747 break;
748 case SNDRV_PCM_FORMAT_S32_LE: 748 case 32:
749 iface_ctl |= 0x60; 749 iface_ctl |= 0x60;
750 break; 750 break;
751 } 751 }
@@ -817,8 +817,8 @@ static int wm8978_hw_params(struct snd_pcm_substream *substream,
817 wm8978->sysclk == WM8978_MCLK ? 817 wm8978->sysclk == WM8978_MCLK ?
818 ", consider using PLL" : ""); 818 ", consider using PLL" : "");
819 819
820 dev_dbg(codec->dev, "%s: fmt %d, rate %u, MCLK divisor #%d\n", __func__, 820 dev_dbg(codec->dev, "%s: width %d, rate %u, MCLK divisor #%d\n", __func__,
821 params_format(params), params_rate(params), best); 821 params_width(params), params_rate(params), best);
822 822
823 /* MCLK divisor mask = 0xe0 */ 823 /* MCLK divisor mask = 0xe0 */
824 snd_soc_update_bits(codec, WM8978_CLOCKING, 0xe0, best << 5); 824 snd_soc_update_bits(codec, WM8978_CLOCKING, 0xe0, best << 5);