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 cbe945f1dc9cf10d7b30f765f83194ec89031034..a263696ef8acc6e3a048efdb20b9fc6f05ac0c53 100644 (file)
--- 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;
 }
 
 /*