Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / sound / soc / codecs / wm8990.c

diff --git a/sound/soc/codecs/wm8990.c b/sound/soc/codecs/wm8990.c
index 264828e4e67c8be0d7e43a8ffd6d2f4d96498d74..100aeee5ba96472e0a0ecb70b7f66d9c4a550d5a 100644 (file)
--- a/sound/soc/codecs/wm8990.c
+++ b/sound/soc/codecs/wm8990.c
@@ -23,7 +23,6 @@
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
-#include <sound/soc-dapm.h>
 #include <sound/initval.h>
 #include <sound/tlv.h>
 #include <asm/div64.h>
@@ -914,11 +913,12 @@ static const struct snd_soc_dapm_route audio_map[] = {
 
 static int wm8990_add_widgets(struct snd_soc_codec *codec)
 {
-       snd_soc_dapm_new_controls(codec, wm8990_dapm_widgets,
-                                 ARRAY_SIZE(wm8990_dapm_widgets));
+       struct snd_soc_dapm_context *dapm = &codec->dapm;
 
+       snd_soc_dapm_new_controls(dapm, wm8990_dapm_widgets,
+                                 ARRAY_SIZE(wm8990_dapm_widgets));
        /* set up the WM8990 audio map */
-       snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map));
+       snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));
 
        return 0;
 }
@@ -1170,7 +1170,7 @@ static int wm8990_set_bias_level(struct snd_soc_codec *codec,
                break;
 
        case SND_SOC_BIAS_STANDBY:
-               if (codec->bias_level == SND_SOC_BIAS_OFF) {
+               if (codec->dapm.bias_level == SND_SOC_BIAS_OFF) {
                        /* Enable all output discharge bits */
                        snd_soc_write(codec, WM8990_ANTIPOP1, WM8990_DIS_LLINE |
                                WM8990_DIS_RLINE | WM8990_DIS_OUT3 |
@@ -1183,7 +1183,7 @@ static int wm8990_set_bias_level(struct snd_soc_codec *codec,
                                     WM8990_VMIDTOG);
 
                        /* Delay to allow output caps to discharge */
-                       msleep(msecs_to_jiffies(300));
+                       msleep(300);
 
                        /* Disable VMIDTOG */
                        snd_soc_write(codec, WM8990_ANTIPOP2, WM8990_SOFTST |
@@ -1195,17 +1195,17 @@ static int wm8990_set_bias_level(struct snd_soc_codec *codec,
                        /* Enable outputs */
                        snd_soc_write(codec, WM8990_POWER_MANAGEMENT_1, 0x1b00);
 
-                       msleep(msecs_to_jiffies(50));
+                       msleep(50);
 
                        /* Enable VMID at 2x50k */
                        snd_soc_write(codec, WM8990_POWER_MANAGEMENT_1, 0x1f02);
 
-                       msleep(msecs_to_jiffies(100));
+                       msleep(100);
 
                        /* Enable VREF */
                        snd_soc_write(codec, WM8990_POWER_MANAGEMENT_1, 0x1f03);
 
-                       msleep(msecs_to_jiffies(600));
+                       msleep(600);
 
                        /* Enable BUFIOEN */
                        snd_soc_write(codec, WM8990_ANTIPOP2, WM8990_SOFTST |
@@ -1250,7 +1250,7 @@ static int wm8990_set_bias_level(struct snd_soc_codec *codec,
                /* Disable VMID */
                snd_soc_write(codec, WM8990_POWER_MANAGEMENT_1, 0x1f01);
 
-               msleep(msecs_to_jiffies(300));
+               msleep(300);
 
                /* Enable all output discharge bits */
                snd_soc_write(codec, WM8990_ANTIPOP1, WM8990_DIS_LLINE |
@@ -1266,7 +1266,7 @@ static int wm8990_set_bias_level(struct snd_soc_codec *codec,
                break;
        }
 
-       codec->bias_level = level;
+       codec->dapm.bias_level = level;
        return 0;
 }