ASoC: omap: Convert bunch of machine drivers to use init time DAI format

Signed-off-by: Jarkko Nikula <jarkko.nikula@bitmer.com>
Cc: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

1 files changed, 2 insertions, 18 deletions

diff --git a/sound/soc/omap/rx51.c b/sound/soc/omap/rx51.c
index 893300a53bab..7164db5fc38a 100644
--- a/sound/soc/omap/rx51.c
+++ b/sound/soc/omap/rx51.c
@@ -115,24 +115,6 @@ static int rx51_hw_params(struct snd_pcm_substream *substream,
 {
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
         struct snd_soc_dai *codec_dai = rtd->codec_dai;
-        struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
-        int err;
-
-        /* Set codec DAI configuration */
-        err = snd_soc_dai_set_fmt(codec_dai,
-                                  SND_SOC_DAIFMT_DSP_A |
-                                  SND_SOC_DAIFMT_IB_NF |
-                                  SND_SOC_DAIFMT_CBM_CFM);
-        if (err < 0)
-                return err;
-
-        /* Set cpu DAI configuration */
-        err = snd_soc_dai_set_fmt(cpu_dai,
-                                  SND_SOC_DAIFMT_DSP_A |
-                                  SND_SOC_DAIFMT_IB_NF |
-                                  SND_SOC_DAIFMT_CBM_CFM);
-        if (err < 0)
-                return err;
 
         /* Set the codec system clock for DAC and ADC */
         return snd_soc_dai_set_sysclk(codec_dai, 0, 19200000,
@@ -377,6 +359,8 @@ static struct snd_soc_dai_link rx51_dai[] = {
                 .codec_dai_name = "tlv320aic3x-hifi",
                 .platform_name = "omap-pcm-audio",
                 .codec_name = "tlv320aic3x-codec.2-0018",
+                .dai_fmt = SND_SOC_DAIFMT_DSP_A | SND_SOC_DAIFMT_IB_NF |
+                           SND_SOC_DAIFMT_CBM_CFM,
                 .init = rx51_aic34_init,
                 .ops = &rx51_ops,
         },