ASoC: Specify target bias state directly as a bias state

Rather than a simple flag to say if we want the DAPM context to be at full
power specify the target bias state. This should have no current effect
but is a bit more direct and so makes it easier to change our decisions
about the which bias state to go into in future.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>

2 files changed, 5 insertions, 5 deletions

diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h
index c46e7d89561d..7415878c8b37 100644
--- a/include/sound/soc-dapm.h
+++ b/include/sound/soc-dapm.h
@@ -510,7 +510,7 @@ struct snd_soc_dapm_context {
         struct snd_soc_card *card; /* parent card */
 
         /* used during DAPM updates */
-        int dev_power;
+        enum snd_soc_bias_level target_bias_level;
         struct list_head list;
 
 #ifdef CONFIG_DEBUG_FS
diff --git a/include/sound/soc.h b/include/sound/soc.h
index f1de3e0c75bc..0f297006f5b2 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -214,10 +214,10 @@
  * @OFF:     Power Off. No restrictions on transition times.
  */
 enum snd_soc_bias_level {
-        SND_SOC_BIAS_OFF,
-        SND_SOC_BIAS_STANDBY,
-        SND_SOC_BIAS_PREPARE,
-        SND_SOC_BIAS_ON,
+        SND_SOC_BIAS_OFF = 0,
+        SND_SOC_BIAS_STANDBY = 1,
+        SND_SOC_BIAS_PREPARE = 2,
+        SND_SOC_BIAS_ON = 3,
 };
 
 struct snd_jack;