ASoC: soc-core: move soc_link_dai_pcm_new()

This patch moves soc_link_dai_pcm_new() to upper side.
This is prepare for its cleanup.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/874ky9yq5o.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index f82d521306b707965c2677766951c930dccc8e51..8ace5f5b251c7e4465267cbb214ccaf757c3dcdc 100644 (file)
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1102,6 +1102,27 @@ _err_defer:
 }
 EXPORT_SYMBOL_GPL(snd_soc_add_pcm_runtime);
 
+static int soc_link_dai_pcm_new(struct snd_soc_dai **dais, int num_dais,
+                               struct snd_soc_pcm_runtime *rtd)
+{
+       int i, ret = 0;
+
+       for (i = 0; i < num_dais; ++i) {
+               struct snd_soc_dai_driver *drv = dais[i]->driver;
+
+               if (drv->pcm_new)
+                       ret = drv->pcm_new(rtd, dais[i]);
+               if (ret < 0) {
+                       dev_err(dais[i]->dev,
+                               "ASoC: Failed to bind %s with pcm device\n",
+                               dais[i]->name);
+                       return ret;
+               }
+       }
+
+       return 0;
+}
+
 static void soc_set_of_name_prefix(struct snd_soc_component *component)
 {
        struct device_node *of_node = soc_component_to_node(component);
@@ -1379,27 +1400,6 @@ static int soc_probe_link_components(struct snd_soc_card *card)
        return 0;
 }
 
-static int soc_link_dai_pcm_new(struct snd_soc_dai **dais, int num_dais,
-                               struct snd_soc_pcm_runtime *rtd)
-{
-       int i, ret = 0;
-
-       for (i = 0; i < num_dais; ++i) {
-               struct snd_soc_dai_driver *drv = dais[i]->driver;
-
-               if (drv->pcm_new)
-                       ret = drv->pcm_new(rtd, dais[i]);
-               if (ret < 0) {
-                       dev_err(dais[i]->dev,
-                               "ASoC: Failed to bind %s with pcm device\n",
-                               dais[i]->name);
-                       return ret;
-               }
-       }
-
-       return 0;
-}
-
 static int soc_link_init(struct snd_soc_card *card,
                         struct snd_soc_pcm_runtime *rtd)
 {