diff options
| author | Nicholas Mc Guire <hofrat@osadl.org> | 2015-05-25 08:16:50 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-05-25 17:46:21 -0400 |
| commit | 005e8709c6179b75830971efa891c7ed33e02d1e (patch) | |
| tree | fae5b9fe1972185af2a5b50119f96d8e82a59a58 /net/irda/timer.c | |
| parent | d07ce242e69190b6f033ffd49b8c77931deba4b3 (diff) | |
| download | linux-stable-005e8709c6179b75830971efa891c7ed33e02d1e.tar.gz linux-stable-005e8709c6179b75830971efa891c7ed33e02d1e.tar.bz2 linux-stable-005e8709c6179b75830971efa891c7ed33e02d1e.zip | |
irda: use msecs_to_jiffies for conversion to jiffies
API compliance scanning with coccinelle flagged:
./net/irda/timer.c:63:35-37: use of msecs_to_jiffies probably perferable
Converting milliseconds to jiffies by "val * HZ / 1000" technically
is not a clean solution as it does not handle all corner cases correctly.
By changing the conversion to use msecs_to_jiffies(val) conversion is
correct in all cases. Further the () around the arithmetic expression
was dropped.
Patch was compile tested for x86_64_defconfig + CONFIG_IRDA=m
Patch is against 4.1-rc4 (localversion-next is -next-20150522)
Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/irda/timer.c')
| -rw-r--r-- | net/irda/timer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/irda/timer.c b/net/irda/timer.c index 0c4c115a5cab..f2280f73b057 100644 --- a/net/irda/timer.c +++ b/net/irda/timer.c @@ -60,8 +60,8 @@ void irlap_start_query_timer(struct irlap_cb *self, int S, int s) * to avoid messing with for incoming connections requests and * to accommodate devices that perform discovery slower than us. * Jean II */ - timeout = ((sysctl_slot_timeout * HZ / 1000) * (S - s) - + XIDEXTRA_TIMEOUT + SMALLBUSY_TIMEOUT); + timeout = msecs_to_jiffies(sysctl_slot_timeout) * (S - s) + + XIDEXTRA_TIMEOUT + SMALLBUSY_TIMEOUT; /* Set or re-set the timer. We reset the timer for each received * discovery query, which allow us to automatically adjust to |