commit 8d06afab73a75f40ae2864e6c296356bab1ab473
author Ingo Molnar <mingo@elte.hu> Fri Sep 09 13:10:40 2005 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Fri Sep 09 14:03:48 2005 -0700
tree 1d9c8c24a1024a12a4e8df841fba5809fa914356
parent 7c352bdf048811b8128019ffc1e886161e09c11c

[PATCH] timer initialization cleanup: DEFINE_TIMER

Clean up timer initialization by introducing DEFINE_TIMER a'la
DEFINE_SPINLOCK.  Build and boot-tested on x86.  A similar patch has been
been in the -RT tree for some time.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

drivers/cdrom/sjcd.c

diff --git a/drivers/cdrom/sjcd.c b/drivers/cdrom/sjcd.c
index 4e7a342..74b1cad 100644
--- a/drivers/cdrom/sjcd.c
+++ b/drivers/cdrom/sjcd.c
@@ -151,7 +151,7 @@
 /*
  * Timer.
  */
-static struct timer_list sjcd_delay_timer = TIMER_INITIALIZER(NULL, 0, 0);
+static DEFINE_TIMER(sjcd_delay_timer, NULL, 0, 0);
 
 #define SJCD_SET_TIMER( func, tmout )           \
     ( sjcd_delay_timer.expires = jiffies+tmout,         \