]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
ASoC: Use dai_fmt in snappercl15 machine driver
authorAxel Lin <axel.lin@gmail.com>
Sat, 17 Dec 2011 07:41:11 +0000 (15:41 +0800)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 20 Dec 2011 00:52:13 +0000 (00:52 +0000)
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Reviewed-by: Mika Westerberg <mika.westerberg@iki.fi>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/ep93xx/snappercl15.c

index 33901d647b728ab761ba41befb91d9225935b4ce..e97cd5701f5194da2853738035b93057311f37e7 100644 (file)
@@ -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,
 };