staging: rtl8712: cleanup of timeout conversions

This is only an API consolidation to make things more readable.
Instances of  var * HZ / 1000  are replaced by  msecs_to_jiffies(var).
As msecs_to_jiffies will return > 0 if it is passed a value > 0 the
== 0 check is not needed.

Signed-off-by: Nicholas Mc Guire <der.herr@hofr.at>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8712/osdep_service.h b/drivers/staging/rtl8712/osdep_service.h
index 5153ad9c2c758d5842dea46229127581801029c7..f9337135340b39900ed2999f1b3d713629eb8f5b 100644 (file)
--- a/drivers/staging/rtl8712/osdep_service.h
+++ b/drivers/staging/rtl8712/osdep_service.h
@@ -71,7 +71,7 @@ static inline void _init_timer(struct timer_list *ptimer,
 
 static inline void _set_timer(struct timer_list *ptimer, u32 delay_time)
 {
-       mod_timer(ptimer, (jiffies+(delay_time*HZ/1000)));
+       mod_timer(ptimer, (jiffies+msecs_to_jiffies(delay_time)));
 }
 
 static inline void _cancel_timer(struct timer_list *ptimer, u8 *bcancelled)
@@ -101,9 +101,7 @@ static inline void sleep_schedulable(int ms)
 {
        u32 delta;
 
-       delta = (ms * HZ) / 1000;/*(ms)*/
-       if (delta == 0)
-               delta = 1;/* 1 ms */
+       delta = msecs_to_jiffies(ms);/*(ms)*/
        set_current_state(TASK_INTERRUPTIBLE);
        if (schedule_timeout(delta) != 0)
                return;