Messages in this thread Patch in this message | | | From | Nicholas Mc Guire <> | Subject | [PATCH] snsc: pass timeout as HZ independent value | Date | Wed, 27 May 2015 18:34:47 +0200 |
| |
schedule_timeout takes a timeout in jiffies but the code currently is passing in a constant SCDRV_TIMEOUT which makes this timeout HZ dependent, so pass it through msecs_to_jiffies() to fix this up.
patch was compile tested with generic_defconfig (implies CONFIG_SGI_SNSC=y)
Patch is against 4.0-rc5 (localversion-next is -next-20150527)
Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org> ---
As there is no documentation of the intended timeout it might be wrong to convert it with msecs_to_jiffies as this reduces the actual jiffies value by at least a factor of 10 - so someone that knows this driver needs to check on the actual value - but in any case it needs to be passed in a HZ independent way.
Also the whole ia64 build did not look like it was too well maintained, - lots of build warnings - so not sure if such cleanup patches here make too much sense.
drivers/char/snsc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/char/snsc.c b/drivers/char/snsc.c index 8bab592..8a80ead 100644 --- a/drivers/char/snsc.c +++ b/drivers/char/snsc.c @@ -198,7 +198,7 @@ scdrv_read(struct file *file, char __user *buf, size_t count, loff_t *f_pos) add_wait_queue(&sd->sd_rq, &wait); spin_unlock_irqrestore(&sd->sd_rlock, flags); - schedule_timeout(SCDRV_TIMEOUT); + schedule_timeout(msecs_to_jiffies(SCDRV_TIMEOUT)); remove_wait_queue(&sd->sd_rq, &wait); if (signal_pending(current)) { @@ -294,7 +294,7 @@ scdrv_write(struct file *file, const char __user *buf, add_wait_queue(&sd->sd_wq, &wait); spin_unlock_irqrestore(&sd->sd_wlock, flags); - schedule_timeout(SCDRV_TIMEOUT); + schedule_timeout(msecs_to_jiffies(SCDRV_TIMEOUT)); remove_wait_queue(&sd->sd_wq, &wait); if (signal_pending(current)) { -- 1.7.10.4
| |