summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown2014-07-31 13:53:08 +0200
committerMark Brown2014-07-31 19:47:37 +0200
commit74b24c3866f4cbd129a21651a1e2dfe81a10b268 (patch)
treea01cfc78eb97eedb79cce5f8c3154cbd5636f612
parentASoC: wm8904: Convert to params_width() (diff)
downloadkernel-qcow2-linux-74b24c3866f4cbd129a21651a1e2dfe81a10b268.tar.gz
kernel-qcow2-linux-74b24c3866f4cbd129a21651a1e2dfe81a10b268.tar.xz
kernel-qcow2-linux-74b24c3866f4cbd129a21651a1e2dfe81a10b268.zip
ASoC: wm8940: 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>
-rw-r--r--sound/soc/codecs/wm8940.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/sound/soc/codecs/wm8940.c b/sound/soc/codecs/wm8940.c
index fc6eec9ad66b..52011043e54c 100644
--- a/sound/soc/codecs/wm8940.c
+++ b/sound/soc/codecs/wm8940.c
@@ -430,19 +430,19 @@ static int wm8940_i2s_hw_params(struct snd_pcm_substream *substream,
if (ret)
goto error_ret;
- switch (params_format(params)) {
- case SNDRV_PCM_FORMAT_S8:
+ switch (params_width(params)) {
+ case 8:
companding = companding | (1 << 5);
break;
- case SNDRV_PCM_FORMAT_S16_LE:
+ case 16:
break;
- case SNDRV_PCM_FORMAT_S20_3LE:
+ case 20:
iface |= (1 << 5);
break;
- case SNDRV_PCM_FORMAT_S24_LE:
+ case 24:
iface |= (2 << 5);
break;
- case SNDRV_PCM_FORMAT_S32_LE:
+ case 32:
iface |= (3 << 5);
break;
}