ASoC: WM8990: msleep() takes milliseconds not jiffies

commit 7ebcf5d6021a696680ee77d9162a2edec2d671dd upstream.

Signed-off-by: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/sound/soc/codecs/wm8990.c b/sound/soc/codecs/wm8990.c
index 2f76f4dae9789a51a9b7544911c597445e46aceb..8637fa323a06bbd668805bf3c1ba8acdfbf7a857 100644 (file)
--- a/sound/soc/codecs/wm8990.c
+++ b/sound/soc/codecs/wm8990.c
@@ -1184,7 +1184,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 |
@@ -1196,17 +1196,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 |
@@ -1251,7 +1251,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 |