ASoC: blackfin: Use dai_fmt

[deliverable/linux.git] / sound / soc / blackfin / bf5xx-ad73311.c

diff --git a/sound/soc/blackfin/bf5xx-ad73311.c b/sound/soc/blackfin/bf5xx-ad73311.c
index 8e49508596dad59911ab3ac3c4ae1baa006cc678..61cc91d4a028f8916d9c48adf0d14df2406368e2 100644 (file)
--- a/sound/soc/blackfin/bf5xx-ad73311.c
+++ b/sound/soc/blackfin/bf5xx-ad73311.c
@@ -145,29 +145,8 @@ static int bf5xx_probe(struct snd_soc_card *card)
        return 0;
 }
 
-static int bf5xx_ad73311_hw_params(struct snd_pcm_substream *substream,
-       struct snd_pcm_hw_params *params)
-{
-       struct snd_soc_pcm_runtime *rtd = substream->private_data;
-       struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
-       int ret = 0;
-
-       pr_debug("%s rate %d format %x\n", __func__, params_rate(params),
-               params_format(params));
-
-       /* set cpu DAI configuration */
-       ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_DSP_A |
-               SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBM_CFM);
-       if (ret < 0)
-               return ret;
-
-       return 0;
-}
-
-
-static struct snd_soc_ops bf5xx_ad73311_ops = {
-       .hw_params = bf5xx_ad73311_hw_params,
-};
+#define BF5XX_AD7311_DAI_FMT (SND_SOC_DAIFMT_DSP_A | SND_SOC_DAIFMT_NB_NF | \
+                               SND_SOC_DAIFMT_CBM_CFM)
 
 static struct snd_soc_dai_link bf5xx_ad73311_dai[] = {
        {
@@ -177,7 +156,7 @@ static struct snd_soc_dai_link bf5xx_ad73311_dai[] = {
                .codec_dai_name = "ad73311-hifi",
                .platform_name = "bfin-i2s-pcm-audio",
                .codec_name = "ad73311",
-               .ops = &bf5xx_ad73311_ops,
+               .dai_fmt = BF5XX_AD7311_DAI_FMT,
        },
        {
                .name = "ad73311",
@@ -186,7 +165,7 @@ static struct snd_soc_dai_link bf5xx_ad73311_dai[] = {
                .codec_dai_name = "ad73311-hifi",
                .platform_name = "bfin-i2s-pcm-audio",
                .codec_name = "ad73311",
-               .ops = &bf5xx_ad73311_ops,
+               .dai_fmt = BF5XX_AD7311_DAI_FMT,
        },
 };