* [PATCH v2] staging: rts5208: use msecs_to_jiffies for timeouts
@ 2015-01-23 7:15 Nicholas Mc Guire
2015-01-25 12:01 ` Greg Kroah-Hartman
0 siblings, 1 reply; 2+ messages in thread
From: Nicholas Mc Guire @ 2015-01-23 7:15 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: Surya Seetharaman, Keerthimai Janarthanan, Tina Johnson,
Sarah Sharp, Fabio Falzoi, devel, linux-kernel,
Nicholas Mc Guire
This is only an API consolidation and should make things more readable
Signed-off-by: Nicholas Mc Guire <der.herr@hofr.at>
---
v2: typo in patch subject fixed - no change in actual patch
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-rc5 -next-20150122
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__);
--
1.7.10.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2] staging: rts5208: use msecs_to_jiffies for timeouts
2015-01-23 7:15 [PATCH v2] staging: rts5208: use msecs_to_jiffies for timeouts Nicholas Mc Guire
@ 2015-01-25 12:01 ` Greg Kroah-Hartman
0 siblings, 0 replies; 2+ messages in thread
From: Greg Kroah-Hartman @ 2015-01-25 12:01 UTC (permalink / raw)
To: Nicholas Mc Guire
Cc: Surya Seetharaman, Keerthimai Janarthanan, Tina Johnson,
Sarah Sharp, Fabio Falzoi, devel, linux-kernel
On Fri, Jan 23, 2015 at 08:15:53AM +0100, Nicholas Mc Guire wrote:
> This is only an API consolidation and should make things more readable
>
> 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.
>
> Signed-off-by: Nicholas Mc Guire <der.herr@hofr.at>
> ---
>
> v2: typo in patch subject fixed - no change in actual patch
>
> This patch was only compile tested with x86_64_defconfig + CONFIG_STAGING=y,
> CONFIG_RTS5208=m
>
> Patch is against 3.19.0-rc5 -next-20150122
>
> drivers/staging/rts5208/rtsx_transport.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
Applied, thanks.
greg k-h
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-01-25 16:21 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-01-23 7:15 [PATCH v2] staging: rts5208: use msecs_to_jiffies for timeouts Nicholas Mc Guire
2015-01-25 12:01 ` Greg Kroah-Hartman
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.