ASoC: Use dai_fmt in tavorevb3 machine driver
authorAxel Lin <axel.lin@gmail.com>
Fri, 30 Dec 2011 15:43:44 +0000 (23:43 +0800)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 2 Jan 2012 13:08:39 +0000 (13:08 +0000)
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/pxa/tavorevb3.c

index 56ee82f61189f03b417e1fb651a118d169cfcc93..8b5ab8f72726258b7e604c24e4c766baa594465d 100644 (file)
@@ -92,16 +92,6 @@ static int evb3_i2s_hw_params(struct snd_pcm_substream *substream,
        if (ret < 0)
                return ret;
 
-       ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_I2S |
-                       SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBM_CFM);
-       if (ret < 0)
-               return ret;
-
-       ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S |
-                       SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBM_CFM);
-       if (ret < 0)
-               return ret;
-
        ret = snd_soc_dai_set_tdm_slot(cpu_dai, 3, 3, 2, width);
        return ret;
 }
@@ -119,6 +109,8 @@ static struct snd_soc_dai_link evb3_dai[] = {
                .platform_name  = "pxa-pcm-audio",
                .codec_name     = "88pm860x-codec",
                .init           = evb3_pm860x_init,
+               .dai_fmt        = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
+                                 SND_SOC_DAIFMT_CBM_CFM,
                .ops            = &evb3_i2s_ops,
        },
 };