From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Date: Thu, 4 Sep 2025 05:21:37 +0000 (+0000)
Subject: ASoC: soc-dapm: tidyup idle_bias handling - step2
X-Git-Tag: v6.18-rc1~135^2~13^2~2^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b4fdc8b75a902eeb7441dff1876c2bb31c7715f;p=thirdparty%2Fkernel%2Fstable.git

ASoC: soc-dapm: tidyup idle_bias handling - step2

Current dapm_get_idle_bias() is unnecessarily complicated/confusable.
Tidyup it.

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

diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index cbe945f1dc9cf..a263696ef8acc 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -2182,21 +2182,16 @@ end:
 
 static bool dapm_get_idle_bias(struct snd_soc_dapm_context *dapm)
 {
-	struct snd_soc_component *component = snd_soc_dapm_to_component(dapm);
-	if (!dapm->idle_bias)
-		return false;
+	if (dapm->idle_bias) {
+		struct snd_soc_component *component = snd_soc_dapm_to_component(dapm);
+		unsigned int state = snd_power_get_state(dapm->card->snd_card);
 
-	switch (snd_power_get_state(dapm->card->snd_card)) {
-	case SNDRV_CTL_POWER_D3hot:
-	case SNDRV_CTL_POWER_D3cold:
-		if (component)
+		if ((state == SNDRV_CTL_POWER_D3hot || (state == SNDRV_CTL_POWER_D3cold)) &&
+		    component)
 			return !component->driver->suspend_bias_off;
-		fallthrough;
-	default:
-		break;
 	}
 
-	return true;
+	return dapm->idle_bias;
 }
 
 /*