Re: [PATCH 07/14] ASoC: soc-component: move soc_{probe/remove}_component() to soc-component.c

["Alvin Šipraga" <alvin.sipraga@analog.com>]

On Tue, Sep 29, 2026 at 05:30:02AM +0000, Kuninori Morimoto wrote:
> struct snd_soc_component will be capsuled soon, its member will not be
> able to access from non soc-component.c.
> 
> Move soc_{probe/remove}_component() to soc-component.c
> 
> It renames function name
> -	soc_{probe/remove}_component()
> +	snd_soc_component_{probe/remove}()
> 
> Then soc-component.c had original snd_soc_component_{probe/remove}() which
> is wrapper function. These wil be deployed internally.
> 
> Releted fucntions also be moved. It renames function name.
> 	soc_set_name_prefix()		-> snd_soc_component_set_name_prefix()
> 	soc_init_component_debugfs()	-> snd_soc_component_debugfs_init()
> 	soc_cleanup_component_debugfs()	-> snd_soc_component_debugfs_cleanup()
> 
> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> ---

Looks good, one minor improvement you might care to make if you send a v2.

>  include/sound/soc-component.h |   2 -
>  sound/soc/soc-component.c     | 191 +++++++++++++++++++++++++++++++---
>  sound/soc/soc-core.c          | 179 +------------------------------
>  sound/soc/soc-internal.h      |   2 +
>  4 files changed, 181 insertions(+), 193 deletions(-)
> 
> diff --git a/include/sound/soc-component.h b/include/sound/soc-component.h
> index 7708d84af8853..f2dccd3c9ca8e 100644
> --- a/include/sound/soc-component.h
> +++ b/include/sound/soc-component.h
> @@ -404,8 +404,6 @@ int snd_soc_component_close(struct snd_soc_component *component,
>  void snd_soc_component_suspend(struct snd_soc_component *component);
>  void snd_soc_component_resume(struct snd_soc_component *component);
>  int snd_soc_component_is_suspended(struct snd_soc_component *component);
> -int snd_soc_component_probe(struct snd_soc_component *component);
> -void snd_soc_component_remove(struct snd_soc_component *component);
>  int snd_soc_component_of_xlate_dai_id(struct snd_soc_component *component,
>  				      struct device_node *ep);
>  int snd_soc_component_of_xlate_dai_name(struct snd_soc_component *component,
> diff --git a/sound/soc/soc-component.c b/sound/soc/soc-component.c
> index 9622ad96d4691..78b348269707d 100644
> --- a/sound/soc/soc-component.c
> +++ b/sound/soc/soc-component.c

[...]

> +static void snd_soc_component_set_name_prefix(struct snd_soc_card *card,
> +					      struct snd_soc_component *component)

The card argument isn't actually needed here, since it's already
populated in the component struct below in
snd_soc_component_probe(). (See below). Maybe it can be dropped in
another patch.

> +{
> +	struct device_node *of_node = snd_soc_component_to_node(component);
> +	const char *str;
> +	int ret, i;
> +
> +	for (i = 0; i < card->num_configs; i++) {
> +		struct snd_soc_codec_conf *map = &card->codec_conf[i];
> +
> +		if (snd_soc_component_matches_dlc(component, &map->dlc) &&
> +		    map->name_prefix) {
> +			component->name_prefix = map->name_prefix;
> +			return;
> +		}
> +	}
> +
> +	/*
> +	 * If there is no configuration table or no match in the table,
> +	 * check if a prefix is provided in the node
> +	 */
> +	ret = of_property_read_string(of_node, "sound-name-prefix", &str);
> +	if (ret < 0)
> +		return;
> +
> +	component->name_prefix = str;
> +}

[...]

> +int snd_soc_component_probe(struct snd_soc_card *card, struct snd_soc_component *component)
> +{
> +	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
> +	struct snd_soc_dai *dai;
> +	int probed = 0;
> +	int ret;
> +
> +	if (snd_soc_component_is_dummy(component))
> +		return 0;
> +
> +	if (component->card) {
> +		if (component->card != card) {
> +			dev_err(component->dev,
> +				"Trying to bind component \"%s\" to card \"%s\" "
> +				"but is already bound to card \"%s\"\n",
> +				component->name, card->name, component->card->name);
> +			return -ENODEV;
> +		}
> +		return 0;
> +	}
> +
> +	ret = snd_soc_component_module_get_when_probe(component);
> +	if (ret < 0)
> +		return ret;
> +
> +	component->card = card;
> +	snd_soc_component_set_name_prefix(card, component);

(Set here).