summaryrefslogtreecommitdiff
path: root/drivers/cdrom/sjcd.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2005-09-09 20:10:40 (GMT)
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-09 21:03:48 (GMT)
commit8d06afab73a75f40ae2864e6c296356bab1ab473 (patch)
tree1d9c8c24a1024a12a4e8df841fba5809fa914356 /drivers/cdrom/sjcd.c
parent7c352bdf048811b8128019ffc1e886161e09c11c (diff)
downloadlinux-8d06afab73a75f40ae2864e6c296356bab1ab473.tar.xz
[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>
Diffstat (limited to 'drivers/cdrom/sjcd.c')
-rw-r--r--drivers/cdrom/sjcd.c2
1 files changed, 1 insertions, 1 deletions
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 @@ static struct sjcd_stat statistic;
/*
* 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, \