the title should be 5208. On 01/19/2015 03:25 PM, Nicholas Mc Guire wrote: > This is only an API consolidation and should make things more readable > > Signed-off-by: Nicholas Mc Guire <der.herr@xxxxxxx> > --- > > Converting milliseconds to jiffies by val * HZ / 1000 is technically > not wrong but msecs_to_jiffies(val) is the cleaner solution and handles > corner cases correctly. > > This patch was only compile tested with x86_64_defconfig + CONFIG_STAGING=y, > CONFIG_RTS5208=m > > Patch is against 3.19.0-rc4 -next-20150116 > > drivers/staging/rts5208/rtsx_transport.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/drivers/staging/rts5208/rtsx_transport.c b/drivers/staging/rts5208/rtsx_transport.c > index 756a968..dab1995 100644 > --- a/drivers/staging/rts5208/rtsx_transport.c > +++ b/drivers/staging/rts5208/rtsx_transport.c > @@ -271,7 +271,7 @@ int rtsx_send_cmd(struct rtsx_chip *chip, u8 card, int timeout) > > /* Wait for TRANS_OK_INT */ > timeleft = wait_for_completion_interruptible_timeout( > - &trans_done, timeout * HZ / 1000); > + &trans_done, msecs_to_jiffies(timeout)); > if (timeleft <= 0) { > dev_dbg(rtsx_dev(chip), "chip->int_reg = 0x%x\n", > chip->int_reg); > @@ -431,7 +431,7 @@ static int rtsx_transfer_sglist_adma_partial(struct rtsx_chip *chip, u8 card, > spin_unlock_irq(&rtsx->reg_lock); > > timeleft = wait_for_completion_interruptible_timeout( > - &trans_done, timeout * HZ / 1000); > + &trans_done, msecs_to_jiffies(timeout)); > if (timeleft <= 0) { > dev_dbg(rtsx_dev(chip), "Timeout (%s %d)\n", > __func__, __LINE__); > @@ -455,7 +455,7 @@ static int rtsx_transfer_sglist_adma_partial(struct rtsx_chip *chip, u8 card, > init_completion(&trans_done); > spin_unlock_irq(&rtsx->reg_lock); > timeleft = wait_for_completion_interruptible_timeout( > - &trans_done, timeout * HZ / 1000); > + &trans_done, msecs_to_jiffies(timeout)); > if (timeleft <= 0) { > dev_dbg(rtsx_dev(chip), "Timeout (%s %d)\n", > __func__, __LINE__); > @@ -575,7 +575,7 @@ static int rtsx_transfer_sglist_adma(struct rtsx_chip *chip, u8 card, > spin_unlock_irq(&rtsx->reg_lock); > > timeleft = wait_for_completion_interruptible_timeout( > - &trans_done, timeout * HZ / 1000); > + &trans_done, msecs_to_jiffies(timeout)); > if (timeleft <= 0) { > dev_dbg(rtsx_dev(chip), "Timeout (%s %d)\n", > __func__, __LINE__); > @@ -602,7 +602,7 @@ static int rtsx_transfer_sglist_adma(struct rtsx_chip *chip, u8 card, > init_completion(&trans_done); > spin_unlock_irq(&rtsx->reg_lock); > timeleft = wait_for_completion_interruptible_timeout( > - &trans_done, timeout * HZ / 1000); > + &trans_done, msecs_to_jiffies(timeout)); > if (timeleft <= 0) { > dev_dbg(rtsx_dev(chip), "Timeout (%s %d)\n", > __func__, __LINE__); > @@ -688,7 +688,7 @@ static int rtsx_transfer_buf(struct rtsx_chip *chip, u8 card, void *buf, > > /* Wait for TRANS_OK_INT */ > timeleft = wait_for_completion_interruptible_timeout( > - &trans_done, timeout * HZ / 1000); > + &trans_done, msecs_to_jiffies(timeout)); > if (timeleft <= 0) { > dev_dbg(rtsx_dev(chip), "Timeout (%s %d)\n", > __func__, __LINE__); _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel