ASoC: Ensure all DAPM widgets have a power check callback
Makes the code simpler.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 12bd01a..8d76044 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -857,6 +857,11 @@
return power;
}
+static int dapm_always_on_check_power(struct snd_soc_dapm_widget *w)
+{
+ return 1;
+}
+
static int dapm_seq_compare(struct snd_soc_dapm_widget *a,
struct snd_soc_dapm_widget *b,
bool power_up)
@@ -1229,9 +1234,6 @@
break;
default:
- if (!w->power_check)
- break;
-
if (!w->force)
power = w->power_check(w);
else
@@ -2090,6 +2092,9 @@
break;
}
+ if (!w->power_check)
+ w->power_check = dapm_always_on_check_power;
+
/* Read the initial power state from the device */
if (w->reg >= 0) {
val = soc_widget_read(w, w->reg);