From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752741AbbAVJBP (ORCPT ); Thu, 22 Jan 2015 04:01:15 -0500 Received: from hofr.at ([212.69.189.236]:42870 "EHLO mail.hofr.at" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751533AbbAVJBD (ORCPT ); Thu, 22 Jan 2015 04:01:03 -0500 Date: Thu, 22 Jan 2015 10:01:01 +0100 From: Nicholas Mc Guire To: ???? Cc: Greg Kroah-Hartman , "devel@driverdev.osuosl.org" , Keerthimai Janarthanan , Sarah Sharp , "linux-kernel@vger.kernel.org" , Fabio Falzoi , Tina Johnson , Surya Seetharaman Subject: Re: [PATCH] staging: rts5028: use msecs_to_jiffies for timeouts Message-ID: <20150122090101.GB27741@opentech.at> References: <1421652347-8484-1-git-send-email-der.herr@hofr.at> <54C05500.8050809@realsil.com.cn> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <54C05500.8050809@realsil.com.cn> User-Agent: Mutt/1.5.18 (2008-05-17) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 22 Jan 2015, ???? wrote: > the title should be 5208. sorry - that was a typo - should this be resubmitted for traceability or is that not necessary ? > > 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 > > --- > > > > 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__); thx! hofrat