[v2] ASoC: generic: update outdated comment for removed soc_bind_dai_link()

[PATCH v2] ASoC: generic: update outdated comment for removed soc_bind_dai_link()

Posted by Kexin Sun 1 week, 6 days ago

The function soc_bind_dai_link() was first merged into
snd_soc_add_dai_link() by commit 63dc47da1f39 ("ASoC: soc-core: merge
snd_soc_add_dai_link() and soc_bind_dai_link()"), and later renamed to
snd_soc_add_pcm_runtime() by commit 0c04800424c4 ("ASoC: soc-core:
rename snd_soc_add_dai_link() to snd_soc_add_pcm_runtime()").

In simple-card.c, also adjust the wording since snd_soc_add_pcm_runtime()
no longer uses "xxx_of_node" fields but matches components by of_node
through snd_soc_find_dai() and snd_soc_is_matching_component().

In simple-card-utils.c, simply update the function name to its
successor snd_soc_add_pcm_runtime().

Assisted-by: unnamed:deepseek-v3.2 coccinelle
Signed-off-by: Kexin Sun <kexinsun@smail.nju.edu.cn>
---
 sound/soc/generic/simple-card-utils.c | 2 +-
 sound/soc/generic/simple-card.c       | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c
index bdc02e85b089..4e0c6d207a4e 100644
--- a/sound/soc/generic/simple-card-utils.c
+++ b/sound/soc/generic/simple-card-utils.c
@@ -699,7 +699,7 @@ void simple_util_canonicalize_cpu(struct snd_soc_dai_link_component *cpus,
 				  int is_single_links)
 {
 	/*
-	 * In soc_bind_dai_link() will check cpu name after
+	 * In snd_soc_add_pcm_runtime() will check cpu name after
 	 * of_node matching if dai_link has cpu_dai_name.
 	 * but, it will never match if name was created by
 	 * fmt_single_name() remove cpu_dai_name if cpu_args
diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index 06638f9a74b8..9937a991846e 100644
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -48,7 +48,8 @@ static int simple_parse_platform(struct simple_util_priv *priv,
 
 	/*
 	 * Get node via "sound-dai = <&phandle port>"
-	 * it will be used as xxx_of_node on soc_bind_dai_link()
+	 * It will be used as the of_node for component matching during
+	 * snd_soc_add_pcm_runtime().
 	 */
 	ret = of_parse_phandle_with_args(node, DAI, CELL, 0, &args);
 	if (ret)
@@ -76,7 +77,8 @@ static int simple_parse_dai(struct simple_util_priv *priv,
 
 	/*
 	 * Get node via "sound-dai = <&phandle port>"
-	 * it will be used as xxx_of_node on soc_bind_dai_link()
+	 * It will be used as the of_node for component matching during
+	 * snd_soc_add_pcm_runtime().
 	 */
 	ret = of_parse_phandle_with_args(node, DAI, CELL, 0, &args);
 	if (ret)
-- 
2.25.1

Re: [PATCH v2] ASoC: generic: update outdated comment for removed soc_bind_dai_link()

Posted by Mark Brown 1 week, 4 days ago

On Sat, 21 Mar 2026 19:50:18 +0800, Kexin Sun wrote:
> ASoC: generic: update outdated comment for removed soc_bind_dai_link()

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-7.1

Thanks!

[1/1] ASoC: generic: update outdated comment for removed soc_bind_dai_link()
      https://git.kernel.org/broonie/sound/c/d57fe7b02072

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark

Re: [PATCH v2] ASoC: generic: update outdated comment for removed soc_bind_dai_link()

Posted by Kuninori Morimoto 1 week, 4 days ago

Hi Kexin

> The function soc_bind_dai_link() was first merged into
> snd_soc_add_dai_link() by commit 63dc47da1f39 ("ASoC: soc-core: merge
> snd_soc_add_dai_link() and soc_bind_dai_link()"), and later renamed to
> snd_soc_add_pcm_runtime() by commit 0c04800424c4 ("ASoC: soc-core:
> rename snd_soc_add_dai_link() to snd_soc_add_pcm_runtime()").
> 
> In simple-card.c, also adjust the wording since snd_soc_add_pcm_runtime()
> no longer uses "xxx_of_node" fields but matches components by of_node
> through snd_soc_find_dai() and snd_soc_is_matching_component().
> 
> In simple-card-utils.c, simply update the function name to its
> successor snd_soc_add_pcm_runtime().
> 
> Assisted-by: unnamed:deepseek-v3.2 coccinelle
> Signed-off-by: Kexin Sun <kexinsun@smail.nju.edu.cn>
> ---

Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

>  sound/soc/generic/simple-card-utils.c | 2 +-
>  sound/soc/generic/simple-card.c       | 6 ++++--
>  2 files changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c
> index bdc02e85b089..4e0c6d207a4e 100644
> --- a/sound/soc/generic/simple-card-utils.c
> +++ b/sound/soc/generic/simple-card-utils.c
> @@ -699,7 +699,7 @@ void simple_util_canonicalize_cpu(struct snd_soc_dai_link_component *cpus,
>                                   int is_single_links)
>  {
>         /*
> -        * In soc_bind_dai_link() will check cpu name after
> +        * In snd_soc_add_pcm_runtime() will check cpu name after
>          * of_node matching if dai_link has cpu_dai_name.
>          * but, it will never match if name was created by
>          * fmt_single_name() remove cpu_dai_name if cpu_args
> diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
> index 06638f9a74b8..9937a991846e 100644
> --- a/sound/soc/generic/simple-card.c
> +++ b/sound/soc/generic/simple-card.c
> @@ -48,7 +48,8 @@ static int simple_parse_platform(struct simple_util_priv *priv,
> 
>         /*
>          * Get node via "sound-dai = <&phandle port>"
> -        * it will be used as xxx_of_node on soc_bind_dai_link()
> +        * It will be used as the of_node for component matching during
> +        * snd_soc_add_pcm_runtime().
>          */
>         ret = of_parse_phandle_with_args(node, DAI, CELL, 0, &args);
>         if (ret)
> @@ -76,7 +77,8 @@ static int simple_parse_dai(struct simple_util_priv *priv,
> 
>         /*
>          * Get node via "sound-dai = <&phandle port>"
> -        * it will be used as xxx_of_node on soc_bind_dai_link()
> +        * It will be used as the of_node for component matching during
> +        * snd_soc_add_pcm_runtime().
>          */
>         ret = of_parse_phandle_with_args(node, DAI, CELL, 0, &args);
>         if (ret)
> --
> 2.25.1
> 
>