[PATCH v5 11/12] ASoC: soc-core: makes snd_soc_component_initialize() / snd_soc_add_component() local
Kuninori Morimoto <[email protected]>
| Newsgroups | org.kernel.vger.linux-sound |
|---|---|
| Message-ID | <[email protected]> |
No one is calling snd_soc_component_initialize() / snd_soc_add_component() calling from driver. Makes them local functions. It renames - snd_soc_add_component() + snd_soc_component_add() Signed-off-by: Kuninori Morimoto <[email protected]> Reviewed-by: Cezary Rojewski <[email protected]> --- include/sound/soc.h | 6 ------ sound/soc/soc-core.c | 18 ++++++++---------- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/include/sound/soc.h b/include/sound/soc.h index cb0de41e2ada5..f46b2bc2a022b 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -447,12 +447,6 @@ 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); -int snd_soc_add_component(struct snd_soc_component *component, - struct snd_soc_dai_driver *dai_drv, - int num_dai); int snd_soc_register_component_c(struct snd_soc_component *component, const struct snd_soc_component_driver *component_driver, struct snd_soc_dai_driver *dai_drv, int num_dai); diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 3b1d18bfadda9..f1368bfe3fa4e 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -2702,9 +2702,9 @@ 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) +static int soc_component_initialize(struct snd_soc_component *component, + const struct snd_soc_component_driver *driver, + struct device *dev) { component->dapm = snd_soc_dapm_alloc(dev); if (!component->dapm) @@ -2730,11 +2730,10 @@ int snd_soc_component_initialize(struct snd_soc_component *component, return 0; } -EXPORT_SYMBOL_GPL(snd_soc_component_initialize); -int snd_soc_add_component(struct snd_soc_component *component, - struct snd_soc_dai_driver *dai_drv, - int num_dai) +static int soc_component_add(struct snd_soc_component *component, + struct snd_soc_dai_driver *dai_drv, + int num_dai) { struct snd_soc_card *card, *c; int ret; @@ -2773,7 +2772,6 @@ int snd_soc_add_component(struct snd_soc_component *component, return ret; } -EXPORT_SYMBOL_GPL(snd_soc_add_component); int snd_soc_register_component_c(struct snd_soc_component *component, const struct snd_soc_component_driver *component_driver, @@ -2782,11 +2780,11 @@ int snd_soc_register_component_c(struct snd_soc_component *component, { int ret; - ret = snd_soc_component_initialize(component, component_driver, component->dev); + ret = soc_component_initialize(component, component_driver, component->dev); if (ret < 0) return ret; - return snd_soc_add_component(component, dai_drv, num_dai); + return soc_component_add(component, dai_drv, num_dai); } EXPORT_SYMBOL_GPL(snd_soc_register_component_c); -- 2.53.0