ASoC: sunxi: merge DAI call back functions into ops

[platform/kernel/linux-starfive.git] / sound / soc / sunxi / sun4i-i2s.c

diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c
index 669d712..5124b6c 100644 (file)
--- a/sound/soc/sunxi/sun4i-i2s.c
+++ b/sound/soc/sunxi/sun4i-i2s.c
@@ -1081,14 +1081,6 @@ static int sun4i_i2s_set_tdm_slot(struct snd_soc_dai *dai,
        return 0;
 }
 
-static const struct snd_soc_dai_ops sun4i_i2s_dai_ops = {
-       .hw_params      = sun4i_i2s_hw_params,
-       .set_fmt        = sun4i_i2s_set_fmt,
-       .set_sysclk     = sun4i_i2s_set_sysclk,
-       .set_tdm_slot   = sun4i_i2s_set_tdm_slot,
-       .trigger        = sun4i_i2s_trigger,
-};
-
 static int sun4i_i2s_dai_probe(struct snd_soc_dai *dai)
 {
        struct sun4i_i2s *i2s = snd_soc_dai_get_drvdata(dai);
@@ -1100,12 +1092,20 @@ static int sun4i_i2s_dai_probe(struct snd_soc_dai *dai)
        return 0;
 }
 
+static const struct snd_soc_dai_ops sun4i_i2s_dai_ops = {
+       .probe          = sun4i_i2s_dai_probe,
+       .hw_params      = sun4i_i2s_hw_params,
+       .set_fmt        = sun4i_i2s_set_fmt,
+       .set_sysclk     = sun4i_i2s_set_sysclk,
+       .set_tdm_slot   = sun4i_i2s_set_tdm_slot,
+       .trigger        = sun4i_i2s_trigger,
+};
+
 #define SUN4I_FORMATS  (SNDRV_PCM_FMTBIT_S16_LE | \
                         SNDRV_PCM_FMTBIT_S20_LE | \
                         SNDRV_PCM_FMTBIT_S24_LE)
 
 static struct snd_soc_dai_driver sun4i_i2s_dai = {
-       .probe = sun4i_i2s_dai_probe,
        .capture = {
                .stream_name = "Capture",
                .channels_min = 1,