staging: i4l: icn: use setup_timer() and mod_timer().
PATCH 1/1 staging: i4l: icn: use setup_timer() and mod_timer().
Use setup_timer() instead of init_timer(), being the preferred/standard way to set a timer up.
Also, quoting the mod_timer() function comment:
-> mod_timer() is a more efficient way to update the expire field of an
active timer (if the timer is inactive it will be activated).
Use setup_timer and mod_timer to setup and arm a timer, to make the code cleaner and easier to read.
Signed-off-by Muhammad Falak R Wani <[email protected]>
--- drivers/staging/i4l/icn/icn.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-)
drivers/staging/i4l/icn/icn.c +9 -10
@@ -980,18 +980,17 @@ icn_loadproto(u_char __user *buffer, icn_card *card) card->secondhalf);#endif spin_lock_irqsave (&card->lock, flags); -init_timer (&card->st_timer); - card->st_timer.expires = jiffies +ICN_TIMER_DCREAD ; - card->st_timer.function = icn_polldchan; - card->st_timer.data = (unsigned long ) card; -add_timer (&card->st_timer); +setup_timer (&card->st_timer, icn_polldchan, + (unsigned long )card); +mod_timer (&card->st_timer, + jiffies +ICN_TIMER_DCREAD ); card->flags |=ICN_FLAGS_RUNNING ;if (card->doubleS0) { -init_timer (&card->other->st_timer); - card->other->st_timer.expires = jiffies +ICN_TIMER_DCREAD ; - card->other->st_timer.function = icn_polldchan; - card->other->st_timer.data = (unsigned long ) card->other; -add_timer (&card->other->st_timer); +setup_timer (&card->other->st_timer, + icn_polldchan, + (unsigned long )card->other); +mod_timer (&card->other->st_timer, + jiffies +ICN_TIMER_DCREAD ); card->other->flags |=ICN_FLAGS_RUNNING ; }spin_unlock_irqrestore (&card->lock, flags);
Signature · 1 line
1.9.1