Merge remote-tracking branches 'asoc/topic/adsp', 'asoc/topic/atmel', 'asoc/topic...

[firefly-linux-kernel-4.4.55.git] / sound / soc / codecs / da7210.c

diff --git a/sound/soc/codecs/da7210.c b/sound/soc/codecs/da7210.c
index 8166dcb2e4a393300b3210d0bcdf3dab5358cba9..e62e294a8033a02ed4e7a90c6c9b41317df79d18 100644 (file)
--- a/sound/soc/codecs/da7210.c
+++ b/sound/soc/codecs/da7210.c
@@ -778,17 +778,17 @@ static int da7210_hw_params(struct snd_pcm_substream *substream,
 
        dai_cfg1 = 0xFC & snd_soc_read(codec, DA7210_DAI_CFG1);
 
-       switch (params_format(params)) {
-       case SNDRV_PCM_FORMAT_S16_LE:
+       switch (params_width(params)) {
+       case 16:
                dai_cfg1 |= DA7210_DAI_WORD_S16_LE;
                break;
-       case SNDRV_PCM_FORMAT_S20_3LE:
+       case 20:
                dai_cfg1 |= DA7210_DAI_WORD_S20_3LE;
                break;
-       case SNDRV_PCM_FORMAT_S24_LE:
+       case 24:
                dai_cfg1 |= DA7210_DAI_WORD_S24_LE;
                break;
-       case SNDRV_PCM_FORMAT_S32_LE:
+       case 32:
                dai_cfg1 |= DA7210_DAI_WORD_S32_LE;
                break;
        default: