From: Xi Wang <xi.wang@gmail.com>
Date: Wed, 21 Dec 2011 02:57:16 +0000 (+0000)
Subject: irda: use msecs_to_jiffies() rather than manual calculation
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=7d6c429b263c2f735f3df8c282cc77a8659e5d74;p=~shefty%2Frdma-dev.git

irda: use msecs_to_jiffies() rather than manual calculation

Also use mod_timer() instead of direct assignment to "expires".

Signed-off-by: Xi Wang <xi.wang@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/irda/af_irda.c b/net/irda/af_irda.c
index c24f25ab67d..bb14c347768 100644
--- a/net/irda/af_irda.c
+++ b/net/irda/af_irda.c
@@ -2558,8 +2558,8 @@ bed:
 			self->errno = 0;
 			setup_timer(&self->watchdog, irda_discovery_timeout,
 					(unsigned long)self);
-			self->watchdog.expires = jiffies + (val * HZ/1000);
-			add_timer(&(self->watchdog));
+			mod_timer(&self->watchdog,
+				  jiffies + msecs_to_jiffies(val));
 
 			/* Wait for IR-LMP to call us back */
 			__wait_event_interruptible(self->query_wait,