lkml.org 
[lkml]   [2004]   [Sep]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[patch 5/9] block/pf: replace pf_sleep() with msleep_interruptible()
    From
    Date



    Any comments would be appreciated. This is a re-push of a patch I
    submitted 20 July which hasn't been merged as of
    2.6.9-rc1-mm5/2.6.9-rc2.

    Description: msleep_interruptible() is used instead of pf_sleep()
    to guarantee the task delays as expected. The defintion of pf_sleep()
    is also removed.

    Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>

    Signed-off-by: Maximilian Attems <janitor@sternwelten.at>
    ---

    linux-2.6.9-rc2-bk7-max/drivers/block/paride/pf.c | 10 ++--------
    1 files changed, 2 insertions(+), 8 deletions(-)

    diff -puN drivers/block/paride/pf.c~msleep_interruptible-drivers_block_pf drivers/block/paride/pf.c
    --- linux-2.6.9-rc2-bk7/drivers/block/paride/pf.c~msleep_interruptible-drivers_block_pf 2004-09-21 21:07:53.000000000 +0200
    +++ linux-2.6.9-rc2-bk7-max/drivers/block/paride/pf.c 2004-09-21 21:07:53.000000000 +0200
    @@ -526,12 +526,6 @@ static void pf_eject(struct pf_unit *pf)

    #define PF_RESET_TMO 30 /* in tenths of a second */

    -static void pf_sleep(int cs)
    -{
    - current->state = TASK_INTERRUPTIBLE;
    - schedule_timeout(cs);
    -}
    -
    /* the ATAPI standard actually specifies the contents of all 7 registers
    after a reset, but the specification is ambiguous concerning the last
    two bytes, and different drives interpret the standard differently.
    @@ -546,11 +540,11 @@ static int pf_reset(struct pf_unit *pf)
    write_reg(pf, 6, 0xa0+0x10*pf->drive);
    write_reg(pf, 7, 8);

    - pf_sleep(20 * HZ / 1000);
    + msleep_interruptible(20);

    k = 0;
    while ((k++ < PF_RESET_TMO) && (status_reg(pf) & STAT_BUSY))
    - pf_sleep(HZ / 10);
    + msleep_interruptible(100);

    flg = 1;
    for (i = 0; i < 5; i++)
    _
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2005-03-22 14:06    [W:0.021 / U:29.772 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site