1 files changed, 21 insertions, 23 deletions

diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 8a3192bcee78..728f3ac2f304 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -763,21 +763,18 @@ static ssize_t dapm_widget_show(struct device *dev,
                 }
         }
 
-        switch(codec->dapm_state){
-        case SNDRV_CTL_POWER_D0:
-                state = "D0";
+        switch (codec->bias_level) {
+        case SND_SOC_BIAS_ON:
+                state = "On";
                 break;
-        case SNDRV_CTL_POWER_D1:
-                state = "D1";
+        case SND_SOC_BIAS_PREPARE:
+                state = "Prepare";
                 break;
-        case SNDRV_CTL_POWER_D2:
-                state = "D2";
+        case SND_SOC_BIAS_STANDBY:
+                state = "Standby";
                 break;
-        case SNDRV_CTL_POWER_D3hot:
-                state = "D3hot";
-                break;
-        case SNDRV_CTL_POWER_D3cold:
-                state = "D3cold";
+        case SND_SOC_BIAS_OFF:
+                state = "Off";
                 break;
         }
         count += sprintf(buf + count, "PM State: %s\n", state);
@@ -1358,27 +1355,28 @@ int snd_soc_dapm_stream_event(struct snd_soc_codec *codec,
 EXPORT_SYMBOL_GPL(snd_soc_dapm_stream_event);
 
 /**
- * snd_soc_dapm_device_event - send a device event to the dapm core
+ * snd_soc_dapm_set_bias_level - set the bias level for the system
  * @socdev: audio device
- * @event: device event
+ * @level: level to configure
  *
- * Sends a device event to the dapm core. The core then makes any
- * necessary machine or codec power changes..
+ * Configure the bias (power) levels for the SoC audio device.
  *
  * Returns 0 for success else error.
  */
-int snd_soc_dapm_device_event(struct snd_soc_device *socdev, int event)
+int snd_soc_dapm_set_bias_level(struct snd_soc_device *socdev,
+                                enum snd_soc_bias_level level)
 {
         struct snd_soc_codec *codec = socdev->codec;
         struct snd_soc_machine *machine = socdev->machine;
+        int ret = 0;
 
-        if (machine->dapm_event)
-                machine->dapm_event(machine, event);
-        if (codec->dapm_event)
-                codec->dapm_event(codec, event);
-        return 0;
+        if (machine->set_bias_level)
+                ret = machine->set_bias_level(machine, level);
+        if (ret == 0 && codec->set_bias_level)
+                ret = codec->set_bias_level(codec, level);
+
+        return ret;
 }
-EXPORT_SYMBOL_GPL(snd_soc_dapm_device_event);
 
 /**
  * snd_soc_dapm_set_endpoint - set audio endpoint status