From 483f52bc66351015a6da44af3664514311c91529 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@gmail.com>
Date: Sat, 17 Dec 2011 15:41:11 +0800
Subject: [PATCH] --- yaml --- r: 283980 b: refs/heads/master c:
 f49f85108b2b3b1aaa7632418411c401fbb6741c h: refs/heads/master v: v3

---
 [refs]                               |  2 +-
 trunk/sound/soc/ep93xx/snappercl15.c | 12 ++----------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index d033a5738881..9d306aca2aaa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f521812b03eb906ece7433ffd681fd5a35c0aced
+refs/heads/master: f49f85108b2b3b1aaa7632418411c401fbb6741c
diff --git a/trunk/sound/soc/ep93xx/snappercl15.c b/trunk/sound/soc/ep93xx/snappercl15.c
index 33901d647b72..e97cd5701f51 100644
--- a/trunk/sound/soc/ep93xx/snappercl15.c
+++ b/trunk/sound/soc/ep93xx/snappercl15.c
@@ -33,16 +33,6 @@ static int snappercl15_hw_params(struct snd_pcm_substream *substream,
 	struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
 	int err;
 
-	err = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S |
-				  SND_SOC_DAIFMT_NB_IF |
-				  SND_SOC_DAIFMT_CBS_CFS);
-
-	err = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_I2S | 
-				  SND_SOC_DAIFMT_NB_IF |		  
-				  SND_SOC_DAIFMT_CBS_CFS);
-	if (err)
-		return err;
-
 	err = snd_soc_dai_set_sysclk(codec_dai, 0, CODEC_CLOCK, 
 				     SND_SOC_CLOCK_IN);
 	if (err)
@@ -96,6 +86,8 @@ static struct snd_soc_dai_link snappercl15_dai = {
 	.codec_name	= "tlv320aic23-codec.0-001a",
 	.platform_name	=  "ep93xx-pcm-audio",
 	.init		= snappercl15_tlv320aic23_init,
+	.dai_fmt	= SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_IF |
+			  SND_SOC_DAIFMT_CBS_CFS,
 	.ops		= &snappercl15_ops,
 };