ASoC: Use dai_fmt in saarb machine driver

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>

diff --git a/sound/soc/pxa/saarb.c b/sound/soc/pxa/saarb.c
index 2e21712cec6765a5089c78352020dbf23f698cce..b2be225b1463a73c8abf6327c5ba3166ed4bafa3 100644 (file)
--- a/sound/soc/pxa/saarb.c
+++ b/sound/soc/pxa/saarb.c
@@ -92,15 +92,6 @@ static int saarb_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 +110,8 @@ static struct snd_soc_dai_link saarb_dai[] = {
                .platform_name  = "pxa-pcm-audio",
                .codec_name     = "88pm860x-codec",
                .init           = saarb_pm860x_init,
+               .dai_fmt        = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
+                                 SND_SOC_DAIFMT_CBM_CFM,
                .ops            = &saarb_i2s_ops,
        },
 };