Merge remote-tracking branches 'asoc/topic/tlv320aic3x', 'asoc/topic/width', 'asoc...

[uclinux-h8/linux.git] / sound / soc / codecs / wm8994.c

diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c
index 39d8df0..6cc0566 100644 (file)
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@ -2815,19 +2815,19 @@ static int wm8994_hw_params(struct snd_pcm_substream *substream,
        }
 
        bclk_rate = params_rate(params);
-       switch (params_format(params)) {
-       case SNDRV_PCM_FORMAT_S16_LE:
+       switch (params_width(params)) {
+       case 16:
                bclk_rate *= 16;
                break;
-       case SNDRV_PCM_FORMAT_S20_3LE:
+       case 20:
                bclk_rate *= 20;
                aif1 |= 0x20;
                break;
-       case SNDRV_PCM_FORMAT_S24_LE:
+       case 24:
                bclk_rate *= 24;
                aif1 |= 0x40;
                break;
-       case SNDRV_PCM_FORMAT_S32_LE:
+       case 32:
                bclk_rate *= 32;
                aif1 |= 0x60;
                break;
@@ -2966,16 +2966,16 @@ static int wm8994_aif3_hw_params(struct snd_pcm_substream *substream,
                return 0;
        }
 
-       switch (params_format(params)) {
-       case SNDRV_PCM_FORMAT_S16_LE:
+       switch (params_width(params)) {
+       case 16:
                break;
-       case SNDRV_PCM_FORMAT_S20_3LE:
+       case 20:
                aif1 |= 0x20;
                break;
-       case SNDRV_PCM_FORMAT_S24_LE:
+       case 24:
                aif1 |= 0x40;
                break;
-       case SNDRV_PCM_FORMAT_S32_LE:
+       case 32:
                aif1 |= 0x60;
                break;
        default: