]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
ASoC: soc-core: remove duplicate snd_soc_flush_all_delayed_work()
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Tue, 31 Mar 2026 01:25:04 +0000 (01:25 +0000)
committerMark Brown <broonie@kernel.org>
Tue, 31 Mar 2026 13:49:23 +0000 (14:49 +0100)
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>
sound/soc/soc-core.c

index 67d9ea319c84a6d34e9fdcef0e0e27145e9cbf6e..071cff39e95a7d6024d00f83b76278feb3f0593a 100644 (file)
@@ -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);
        }
 }