lkml.org 
[lkml]   [2011]   [Mar]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] [49/275] ASoC: WM8990: msleep() takes milliseconds not jiffies
    Date
    2.6.35-longterm review patch.  If anyone has any objections, please let me know.

    ------------------
    From: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>

    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>
    Signed-off-by: Andi Kleen <ak@linux.intel.com>

    ---
    sound/soc/codecs/wm8990.c | 10 +++++-----
    1 file changed, 5 insertions(+), 5 deletions(-)

    Index: linux-2.6.35.y/sound/soc/codecs/wm8990.c
    ===================================================================
    --- linux-2.6.35.y.orig/sound/soc/codecs/wm8990.c 2011-03-29 22:51:49.895446469 -0700
    +++ linux-2.6.35.y/sound/soc/codecs/wm8990.c 2011-03-29 23:02:59.194320786 -0700
    @@ -1185,7 +1185,7 @@
    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 |
    @@ -1197,17 +1197,17 @@
    /* 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 |
    @@ -1252,7 +1252,7 @@
    /* 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 |

    \
     
     \ /
      Last update: 2011-03-31 00:07    [W:4.048 / U:0.496 seconds]
    ©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site