ASoC: bcm: merge DAI call back functions into ops

ALSA SoC merges DAI call backs into .ops.
This patch merge these into one.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87leelb0uk.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/bcm/bcm2835-i2s.c b/sound/soc/bcm/bcm2835-i2s.c
index 85f705afcdbbbb34e12fe56cbc466b58ca65eba1..9bda6499e66e1c10c8c48a02129e6c2e058ef3a6 100644 (file)
--- a/sound/soc/bcm/bcm2835-i2s.c
+++ b/sound/soc/bcm/bcm2835-i2s.c
@@ -737,7 +737,19 @@ static void bcm2835_i2s_shutdown(struct snd_pcm_substream *substream,
        bcm2835_i2s_stop_clock(dev);
 }
 
+static int bcm2835_i2s_dai_probe(struct snd_soc_dai *dai)
+{
+       struct bcm2835_i2s_dev *dev = snd_soc_dai_get_drvdata(dai);
+
+       snd_soc_dai_init_dma_data(dai,
+                                 &dev->dma_data[SNDRV_PCM_STREAM_PLAYBACK],
+                                 &dev->dma_data[SNDRV_PCM_STREAM_CAPTURE]);
+
+       return 0;
+}
+
 static const struct snd_soc_dai_ops bcm2835_i2s_dai_ops = {
+       .probe          = bcm2835_i2s_dai_probe,
        .startup        = bcm2835_i2s_startup,
        .shutdown       = bcm2835_i2s_shutdown,
        .prepare        = bcm2835_i2s_prepare,
@@ -748,20 +760,8 @@ static const struct snd_soc_dai_ops bcm2835_i2s_dai_ops = {
        .set_tdm_slot   = bcm2835_i2s_set_dai_tdm_slot,
 };
 
-static int bcm2835_i2s_dai_probe(struct snd_soc_dai *dai)
-{
-       struct bcm2835_i2s_dev *dev = snd_soc_dai_get_drvdata(dai);
-
-       snd_soc_dai_init_dma_data(dai,
-                       &dev->dma_data[SNDRV_PCM_STREAM_PLAYBACK],
-                       &dev->dma_data[SNDRV_PCM_STREAM_CAPTURE]);
-
-       return 0;
-}
-
 static struct snd_soc_dai_driver bcm2835_i2s_dai = {
        .name   = "bcm2835-i2s",
-       .probe  = bcm2835_i2s_dai_probe,
        .playback = {
                .channels_min = 2,
                .channels_max = 2,