1 files changed, 2 insertions, 21 deletions

diff --git a/sound/soc/omap/osk5912.c b/sound/soc/omap/osk5912.c
index 7e75e775fb4a..597833246e3a 100644
--- a/sound/soc/omap/osk5912.c
+++ b/sound/soc/omap/osk5912.c
@@ -55,29 +55,8 @@ static int osk_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_B |
-                                  SND_SOC_DAIFMT_NB_NF |
-                                  SND_SOC_DAIFMT_CBM_CFM);
-        if (err < 0) {
-                printk(KERN_ERR "can't set codec DAI configuration\n");
-                return err;
-        }
-
-        /* Set cpu DAI configuration */
-        err = snd_soc_dai_set_fmt(cpu_dai,
-                                  SND_SOC_DAIFMT_DSP_B |
-                                  SND_SOC_DAIFMT_NB_NF |
-                                  SND_SOC_DAIFMT_CBM_CFM);
-        if (err < 0) {
-                printk(KERN_ERR "can't set cpu DAI configuration\n");
-                return err;
-        }
-
         /* Set the codec system clock for DAC and ADC */
         err =
             snd_soc_dai_set_sysclk(codec_dai, 0, CODEC_CLOCK, SND_SOC_CLOCK_IN);
@@ -141,6 +120,8 @@ static struct snd_soc_dai_link osk_dai = {
         .codec_dai_name = "tlv320aic23-hifi",
         .platform_name = "omap-pcm-audio",
         .codec_name = "tlv320aic23-codec",
+        .dai_fmt = SND_SOC_DAIFMT_DSP_B | SND_SOC_DAIFMT_NB_NF |
+                   SND_SOC_DAIFMT_CBM_CFM,
         .init = osk_tlv320aic23_init,
         .ops = &osk_ops,
 };