From f9d736f914d4b440f60535be2c1d1af63f1be20b Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Wed, 28 Dec 2011 18:59:30 +0800 Subject: [PATCH] --- yaml --- r: 284026 b: refs/heads/master c: 7e0d6ac0d894ebae2ff85ea6108dd065a274dfb9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/soc/kirkwood/kirkwood-t5325.c | 14 ++------------ 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index 67c68cfb8eb4..98fc407e6a9e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 077a2ba4c8e40e6256948c3b4cc60608a284f555 +refs/heads/master: 7e0d6ac0d894ebae2ff85ea6108dd065a274dfb9 diff --git a/trunk/sound/soc/kirkwood/kirkwood-t5325.c b/trunk/sound/soc/kirkwood/kirkwood-t5325.c index a8930c7c9d1e..6e992307c252 100644 --- a/trunk/sound/soc/kirkwood/kirkwood-t5325.c +++ b/trunk/sound/soc/kirkwood/kirkwood-t5325.c @@ -25,18 +25,7 @@ static int t5325_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 ret; - unsigned int freq, fmt; - - fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS; - ret = snd_soc_dai_set_fmt(cpu_dai, fmt); - if (ret < 0) - return ret; - - ret = snd_soc_dai_set_fmt(codec_dai, fmt); - if (ret < 0) - return ret; + unsigned int freq; freq = params_rate(params) * 256; @@ -90,6 +79,7 @@ static struct snd_soc_dai_link t5325_dai[] = { .platform_name = "kirkwood-pcm-audio", .codec_dai_name = "alc5621-hifi", .codec_name = "alc562x-codec.0-001a", + .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS, .ops = &t5325_ops, .init = t5325_dai_init, },