ASoC: soc-core: move snd_soc_register_dai()

This patch moves snd_soc_register_dai() next to
snd_soc_register_dais().
This is prepare for snd_soc_register_dais() cleanup.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/87y2wu2528.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 0ce3336691386cb36c6e77cb08bdf306e004df25..fb5f01497498375ae8952a71fbcceaa1a543aca5 100644 (file)
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -2597,42 +2597,6 @@ static struct snd_soc_dai *soc_add_dai(struct snd_soc_component *component,
        return dai;
 }
 
-/**
- * snd_soc_register_dais - Register a DAI with the ASoC core
- *
- * @component: The component the DAIs are registered for
- * @dai_drv: DAI driver to use for the DAIs
- * @count: Number of DAIs
- */
-static int snd_soc_register_dais(struct snd_soc_component *component,
-                                struct snd_soc_dai_driver *dai_drv,
-                                size_t count)
-{
-       struct device *dev = component->dev;
-       struct snd_soc_dai *dai;
-       unsigned int i;
-       int ret;
-
-       dev_dbg(dev, "ASoC: dai register %s #%zu\n", dev_name(dev), count);
-
-       for (i = 0; i < count; i++) {
-
-               dai = soc_add_dai(component, dai_drv + i, count == 1 &&
-                                 !component->driver->non_legacy_dai_naming);
-               if (dai == NULL) {
-                       ret = -ENOMEM;
-                       goto err;
-               }
-       }
-
-       return 0;
-
-err:
-       snd_soc_unregister_dais(component);
-
-       return ret;
-}
-
 /**
  * snd_soc_register_dai - Register a DAI dynamically & create its widgets
  *
@@ -2676,6 +2640,42 @@ int snd_soc_register_dai(struct snd_soc_component *component,
 }
 EXPORT_SYMBOL_GPL(snd_soc_register_dai);
 
+/**
+ * snd_soc_register_dais - Register a DAI with the ASoC core
+ *
+ * @component: The component the DAIs are registered for
+ * @dai_drv: DAI driver to use for the DAIs
+ * @count: Number of DAIs
+ */
+static int snd_soc_register_dais(struct snd_soc_component *component,
+                                struct snd_soc_dai_driver *dai_drv,
+                                size_t count)
+{
+       struct device *dev = component->dev;
+       struct snd_soc_dai *dai;
+       unsigned int i;
+       int ret;
+
+       dev_dbg(dev, "ASoC: dai register %s #%zu\n", dev_name(dev), count);
+
+       for (i = 0; i < count; i++) {
+
+               dai = soc_add_dai(component, dai_drv + i, count == 1 &&
+                                 !component->driver->non_legacy_dai_naming);
+               if (dai == NULL) {
+                       ret = -ENOMEM;
+                       goto err;
+               }
+       }
+
+       return 0;
+
+err:
+       snd_soc_unregister_dais(component);
+
+       return ret;
+}
+
 static int snd_soc_component_initialize(struct snd_soc_component *component,
        const struct snd_soc_component_driver *driver, struct device *dev)
 {