ASoC: core: Relocate and expose snd_soc_component_initialize

To allow for two-step component registration, expose
snd_soc_component_initialize function and move it back to soc-core.c.

Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com>
Link: https://lore.kernel.org/r/20200731144146.6678-2-cezary.rojewski@intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/include/sound/soc-component.h b/include/sound/soc-component.h
index 8917b15eccae86c7b5896a71228d2c914bdfd8f8..089ea9441fd1aa30256b7626e86514cc35e2a120 100644 (file)
--- a/include/sound/soc-component.h
+++ b/include/sound/soc-component.h
@@ -325,9 +325,6 @@ static inline int snd_soc_component_cache_sync(
        return regcache_sync(component->regmap);
 }
 
-int snd_soc_component_initialize(struct snd_soc_component *component,
-                                const struct snd_soc_component_driver *driver,
-                                struct device *dev, const char *name);
 void snd_soc_component_set_aux(struct snd_soc_component *component,
                               struct snd_soc_aux_dev *aux);
 int snd_soc_component_init(struct snd_soc_component *component);

diff --git a/include/sound/soc.h b/include/sound/soc.h
index acbb5efb28ef99e3dc53b7cfea94c195a0d19305..77a304d36c61d3054a950389ea7356ccf9b2c9c2 100644 (file)
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -414,6 +414,9 @@ static inline int snd_soc_resume(struct device *dev)
 }
 #endif
 int snd_soc_poweroff(struct device *dev);
+int snd_soc_component_initialize(struct snd_soc_component *component,
+                                const struct snd_soc_component_driver *driver,
+                                struct device *dev, const char *name);
 int snd_soc_add_component(struct device *dev,
                struct snd_soc_component *component,
                const struct snd_soc_component_driver *component_driver,

diff --git a/sound/soc/soc-component.c b/sound/soc/soc-component.c
index dcc89fa8913a49c65781ea49546294120ba0f654..f0b4f4bc44a45117c98d9f9e402c32c44c0c618d 100644 (file)
--- a/sound/soc/soc-component.c
+++ b/sound/soc/soc-component.c
@@ -33,22 +33,6 @@ static inline int _soc_component_ret(struct snd_soc_component *component,
        return ret;
 }
 
-int snd_soc_component_initialize(struct snd_soc_component *component,
-                                const struct snd_soc_component_driver *driver,
-                                struct device *dev, const char *name)
-{
-       INIT_LIST_HEAD(&component->dai_list);
-       INIT_LIST_HEAD(&component->dobj_list);
-       INIT_LIST_HEAD(&component->card_list);
-       mutex_init(&component->io_mutex);
-
-       component->name         = name;
-       component->dev          = dev;
-       component->driver       = driver;
-
-       return 0;
-}
-
 void snd_soc_component_set_aux(struct snd_soc_component *component,
                               struct snd_soc_aux_dev *aux)
 {

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index defd96b14c287fcc7606650988383e7122dfed76..36eba1bb1ce1f6f8624c64568030a3a3c3c456cf 100644 (file)
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -2438,6 +2438,23 @@ static void snd_soc_del_component_unlocked(struct snd_soc_component *component)
        list_del(&component->list);
 }
 
+int snd_soc_component_initialize(struct snd_soc_component *component,
+                                const struct snd_soc_component_driver *driver,
+                                struct device *dev, const char *name)
+{
+       INIT_LIST_HEAD(&component->dai_list);
+       INIT_LIST_HEAD(&component->dobj_list);
+       INIT_LIST_HEAD(&component->card_list);
+       mutex_init(&component->io_mutex);
+
+       component->name         = name;
+       component->dev          = dev;
+       component->driver       = driver;
+
+       return 0;
+}
+EXPORT_SYMBOL_GPL(snd_soc_component_initialize);
+
 int snd_soc_add_component(struct device *dev,
                        struct snd_soc_component *component,
                        const struct snd_soc_component_driver *component_driver,