ASoC: sta32x: Convert to params_width()

The CODEC doesn't care how data is laid out in memory.

Signed-off-by: Mark Brown <broonie@linaro.org>

diff --git a/sound/soc/codecs/sta32x.c b/sound/soc/codecs/sta32x.c
index 0579d187135b1d3932fd20fa19317f5f76cf43c2..48740855566d7a8835b83f487b878bfb80255cdd 100644 (file)
--- a/sound/soc/codecs/sta32x.c
+++ b/sound/soc/codecs/sta32x.c
@@ -678,15 +678,11 @@ static int sta32x_hw_params(struct snd_pcm_substream *substream,
 
        confb = snd_soc_read(codec, STA32X_CONFB);
        confb &= ~(STA32X_CONFB_SAI_MASK | STA32X_CONFB_SAIFB);
-       switch (params_format(params)) {
-       case SNDRV_PCM_FORMAT_S24_LE:
-       case SNDRV_PCM_FORMAT_S24_BE:
-       case SNDRV_PCM_FORMAT_S24_3LE:
-       case SNDRV_PCM_FORMAT_S24_3BE:
+       switch (params_width(params)) {
+       case 24:
                pr_debug("24bit\n");
                /* fall through */
-       case SNDRV_PCM_FORMAT_S32_LE:
-       case SNDRV_PCM_FORMAT_S32_BE:
+       case 32:
                pr_debug("24bit or 32bit\n");
                switch (sta32x->format) {
                case SND_SOC_DAIFMT_I2S:
@@ -701,8 +697,7 @@ static int sta32x_hw_params(struct snd_pcm_substream *substream,
                }
 
                break;
-       case SNDRV_PCM_FORMAT_S20_3LE:
-       case SNDRV_PCM_FORMAT_S20_3BE:
+       case 20:
                pr_debug("20bit\n");
                switch (sta32x->format) {
                case SND_SOC_DAIFMT_I2S:
@@ -717,8 +712,7 @@ static int sta32x_hw_params(struct snd_pcm_substream *substream,
                }
 
                break;
-       case SNDRV_PCM_FORMAT_S18_3LE:
-       case SNDRV_PCM_FORMAT_S18_3BE:
+       case 18:
                pr_debug("18bit\n");
                switch (sta32x->format) {
                case SND_SOC_DAIFMT_I2S:
@@ -733,8 +727,7 @@ static int sta32x_hw_params(struct snd_pcm_substream *substream,
                }
 
                break;
-       case SNDRV_PCM_FORMAT_S16_LE:
-       case SNDRV_PCM_FORMAT_S16_BE:
+       case 16:
                pr_debug("16bit\n");
                switch (sta32x->format) {
                case SND_SOC_DAIFMT_I2S: