[PATCH] Char: timers cleanup

- Use timer macros to set function and data members and to modify
  expiration time.
- Use DEFINE_TIMER for global timers and do not init them at run-time in
  these cases.
- del_timer_sync is common in most cases -- we want to wait for timer
  function if it's still running.

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Cc: Dave Airlie <airlied@linux.ie>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Dominik Brodowski <linux@dominikbrodowski.net>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: Paul Fulghum <paulkf@microgate.com>
Cc: Kylene Jo Hall <kjhall@us.ibm.com>
Cc: Wim Van Sebroeck <wim@iguana.be>
Acked-by: Dmitry Torokhov <dtor@mail.ru>	(Input bits)
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 4 insertions, 8 deletions

diff --git a/drivers/char/specialix.c b/drivers/char/specialix.c
index f1688fe81ac7..baf7234b6e66 100644
--- a/drivers/char/specialix.c
+++ b/drivers/char/specialix.c
@@ -461,8 +461,7 @@ void missed_irq (unsigned long data)
                 sx_interrupt (((struct specialix_board *)data)->irq,
                                 (void*)data);
         }
-        missed_irq_timer.expires = jiffies + sx_poll;
-        add_timer (&missed_irq_timer);
+        mod_timer(&missed_irq_timer, jiffies + sx_poll);
 }
 #endif
 
@@ -597,11 +596,8 @@ static int sx_probe(struct specialix_board *bp)
         dprintk (SX_DEBUG_INIT, " GFCR = 0x%02x\n", sx_in_off(bp, CD186x_GFRCR) );
 
 #ifdef SPECIALIX_TIMER
-        init_timer (&missed_irq_timer);
-        missed_irq_timer.function = missed_irq;
-        missed_irq_timer.data = (unsigned long) bp;
-        missed_irq_timer.expires = jiffies + sx_poll;
-        add_timer (&missed_irq_timer);
+        setup_timer(&missed_irq_timer, missed_irq, (unsigned long)bp);
+        mod_timer(&missed_irq_timer, jiffies + sx_poll);
 #endif
 
         printk(KERN_INFO"sx%d: specialix IO8+ board detected at 0x%03x, IRQ %d, CD%d Rev. %c.\n",
@@ -2559,7 +2555,7 @@ static void __exit specialix_exit_module(void)
                 if (sx_board[i].flags & SX_BOARD_PRESENT)
                         sx_release_io_range(&sx_board[i]);
 #ifdef SPECIALIX_TIMER
-        del_timer (&missed_irq_timer);
+        del_timer_sync(&missed_irq_timer);
 #endif
 
         func_exit();