ASoC: fsl: merge DAI call back functions into ops

[sfrench/cifs-2.6.git] / sound / soc / fsl / fsl_easrc.c

diff --git a/sound/soc/fsl/fsl_easrc.c b/sound/soc/fsl/fsl_easrc.c
index 670cbdb361b6c7e547cc6ce2a1a61588d455eeb7..ba62995c909ac398de929bd9001fe59c93b5492d 100644 (file)
--- a/sound/soc/fsl/fsl_easrc.c
+++ b/sound/soc/fsl/fsl_easrc.c
@@ -1531,13 +1531,6 @@ static int fsl_easrc_hw_free(struct snd_pcm_substream *substream,
        return 0;
 }
 
-static const struct snd_soc_dai_ops fsl_easrc_dai_ops = {
-       .startup = fsl_easrc_startup,
-       .trigger = fsl_easrc_trigger,
-       .hw_params = fsl_easrc_hw_params,
-       .hw_free = fsl_easrc_hw_free,
-};
-
 static int fsl_easrc_dai_probe(struct snd_soc_dai *cpu_dai)
 {
        struct fsl_asrc *easrc = dev_get_drvdata(cpu_dai->dev);
@@ -1548,8 +1541,15 @@ static int fsl_easrc_dai_probe(struct snd_soc_dai *cpu_dai)
        return 0;
 }
 
+static const struct snd_soc_dai_ops fsl_easrc_dai_ops = {
+       .probe          = fsl_easrc_dai_probe,
+       .startup        = fsl_easrc_startup,
+       .trigger        = fsl_easrc_trigger,
+       .hw_params      = fsl_easrc_hw_params,
+       .hw_free        = fsl_easrc_hw_free,
+};
+
 static struct snd_soc_dai_driver fsl_easrc_dai = {
-       .probe = fsl_easrc_dai_probe,
        .playback = {
                .stream_name = "ASRC-Playback",
                .channels_min = 1,