From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Date: Tue, 31 Mar 2026 01:25:04 +0000 (+0000)
Subject: ASoC: soc-core: remove duplicate snd_soc_flush_all_delayed_work()
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9968aad12f362dc686f139e1525d322a768f8ddb;p=thirdparty%2Flinux.git

ASoC: soc-core: remove duplicate snd_soc_flush_all_delayed_work()

snd_soc_unbind_card() calls snd_soc_flush_all_delayed_work() (A),
but it will be called in soc_cleanup_card_resources() (B).
It is duplicated, let's remove it.

(B)	static void soc_cleanup_card_resources(...)
	{
		...
		/* flush delayed work before removing DAIs and DAPM widgets */
(A)'		snd_soc_flush_all_delayed_work(card);
		...
	}

	static void snd_soc_unbind_card(...)
	{
		if (snd_soc_card_is_instantiated(card)) {
			card->instantiated = false;

(A)			snd_soc_flush_all_delayed_work(card);
(B)			soc_cleanup_card_resources(card);
		}
	}

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://patch.msgid.link/87h5pwdc3z.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
---

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 67d9ea319c84..071cff39e95a 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -2153,8 +2153,6 @@ static void snd_soc_unbind_card(struct snd_soc_card *card)
 {
 	if (snd_soc_card_is_instantiated(card)) {
 		card->instantiated = false;
-		snd_soc_flush_all_delayed_work(card);
-
 		soc_cleanup_card_resources(card);
 	}
 }