ASoC: soc-dai: add snd_soc_pcm_dai_new()

We have 2 type of component functions
snd_soc_dai_xxx()     is focusing to dai itself,
snd_soc_pcm_dai_xxx() is focusing to rtd related dai.

Now we can update soc_dai_pcm_new() to
snd_soc_pcm_dai_new(). This patch do it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-By: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/87y2qlssk7.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h
index b33abe93b905953f5d0faa7bebb678bd4d36c587..fd7e203315e656ef7eb448af69b5a3c10e7102a3 100644 (file)
--- a/include/sound/soc-dai.h
+++ b/include/sound/soc-dai.h
@@ -170,6 +170,8 @@ int snd_soc_dai_compress_new(struct snd_soc_dai *dai,
                             struct snd_soc_pcm_runtime *rtd, int num);
 bool snd_soc_dai_stream_valid(struct snd_soc_dai *dai, int stream);
 
+int snd_soc_pcm_dai_new(struct snd_soc_pcm_runtime *rtd);
+
 struct snd_soc_dai_ops {
        /*
         * DAI clocking configuration, all optional.

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 6778eeffb48ffe3ef2d134653d4d24bdec9d1085..76167fa264af1d6b4f9533da50f0cbfd38f6ae44 100644 (file)
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1036,27 +1036,6 @@ _err_defer:
 }
 EXPORT_SYMBOL_GPL(snd_soc_add_pcm_runtime);
 
-static int soc_dai_pcm_new(struct snd_soc_pcm_runtime *rtd)
-{
-       struct snd_soc_dai *dai;
-       int i, ret = 0;
-
-       for_each_rtd_dais(rtd, i, dai) {
-               struct snd_soc_dai_driver *drv = dai->driver;
-
-               if (drv->pcm_new)
-                       ret = drv->pcm_new(rtd, dai);
-               if (ret < 0) {
-                       dev_err(dai->dev,
-                               "ASoC: Failed to bind %s with pcm device\n",
-                               dai->name);
-                       return ret;
-               }
-       }
-
-       return 0;
-}
-
 static int soc_init_pcm_runtime(struct snd_soc_card *card,
                                struct snd_soc_pcm_runtime *rtd)
 {
@@ -1121,7 +1100,7 @@ static int soc_init_pcm_runtime(struct snd_soc_card *card,
                return ret;
        }
 
-       return soc_dai_pcm_new(rtd);
+       return snd_soc_pcm_dai_new(rtd);
 }
 
 static void soc_set_name_prefix(struct snd_soc_card *card,

diff --git a/sound/soc/soc-dai.c b/sound/soc/soc-dai.c
index 93e03c9ec164a633b0cb37cfd873600a8f4473ca..1b45e6e114ade020d24ae3496d9dcbad064fdf1c 100644 (file)
--- a/sound/soc/soc-dai.c
+++ b/sound/soc/soc-dai.c
@@ -445,3 +445,19 @@ bool snd_soc_dai_stream_valid(struct snd_soc_dai *dai, int dir)
        /* If the codec specifies any channels at all, it supports the stream */
        return stream->channels_min;
 }
+
+int snd_soc_pcm_dai_new(struct snd_soc_pcm_runtime *rtd)
+{
+       struct snd_soc_dai *dai;
+       int i, ret = 0;
+
+       for_each_rtd_dais(rtd, i, dai) {
+               if (dai->driver->pcm_new) {
+                       ret = dai->driver->pcm_new(rtd, dai);
+                       if (ret < 0)
+                               return soc_dai_ret(dai, ret);
+               }
+       }
+
+       return 0;
+}