Re: [PATCH 2/2] ASoC: soc-core: handle card->list in snd_soc_unbind_card()

["Rojewski, Cezary" <cezary.rojewski@intel.com>]

On 5/13/2026 3:48 AM, Kuninori Morimoto wrote:
> snd_soc_bind_card()   is handling card->list inside, but
> snd_soc_unbind_card() is handling it in outside.
> Let's handle it inside.
> 
> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> ---
>   sound/soc/soc-core.c | 19 ++++++++++---------
>   1 file changed, 10 insertions(+), 9 deletions(-)
> 
> diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
> index ae8467d88978e..8b2269ba67c3a 100644
> --- a/sound/soc/soc-core.c
> +++ b/sound/soc/soc-core.c
> @@ -1990,12 +1990,18 @@ static void soc_cleanup_card_resources(struct snd_soc_card *card)
>   	}
>   }
>   
> -static void snd_soc_unbind_card(struct snd_soc_card *card)
> +static void snd_soc_unbind_card(struct snd_soc_card *card, bool add_to_list)
>   {
>   	if (snd_soc_card_is_instantiated(card)) {
>   		card->instantiated = false;
>   		soc_cleanup_card_resources(card);
> +
> +		if (add_to_list)
> +			list_add(&card->list, &unbind_card_list);

I see benefit in this.

>   	}
> +
> +	if (!add_to_list)
> +		list_del(&card->list);

But not this.

Moving card-behavior code from component-related function to 
card-related one seems intuitive.  However, snd_soc_unregister_card() is 
already card-lated function.  I'd keep the list_del() there and avoid 
the second if-statement.

>   }
>   
>   static int snd_soc_bind_card(struct snd_soc_card *card)
> @@ -2439,8 +2445,7 @@ void snd_soc_unregister_card(struct snd_soc_card *card)
>   {
>   	guard(mutex)(&client_mutex);
>   
> -	snd_soc_unbind_card(card);
> -	list_del(&card->list);
> +	snd_soc_unbind_card(card, false);
>   
>   	dev_dbg(card->dev, "ASoC: Unregistered card '%s'\n", card->name);
>   }
> @@ -2667,12 +2672,8 @@ static void snd_soc_del_component_unlocked(struct snd_soc_component *component)
>   
>   	snd_soc_unregister_dais(component);
>   
> -	if (card) {
> -		instantiated = card->instantiated;
> -		snd_soc_unbind_card(card);
> -		if (instantiated)
> -			list_add(&card->list, &unbind_card_list);
> -	}
> +	if (card)
> +		snd_soc_unbind_card(card, true);
>   
>   	list_del(&component->list);
>   }