diff options
author | Ingo Molnar <mingo@elte.hu> | 2005-09-09 13:10:40 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-09 14:03:48 -0700 |
commit | 8d06afab73a75f40ae2864e6c296356bab1ab473 (patch) | |
tree | 1d9c8c24a1024a12a4e8df841fba5809fa914356 /drivers/cdrom/optcd.c | |
parent | 7c352bdf048811b8128019ffc1e886161e09c11c (diff) | |
download | kernel_samsung_tuna-8d06afab73a75f40ae2864e6c296356bab1ab473.zip kernel_samsung_tuna-8d06afab73a75f40ae2864e6c296356bab1ab473.tar.gz kernel_samsung_tuna-8d06afab73a75f40ae2864e6c296356bab1ab473.tar.bz2 |
[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/optcd.c')
-rw-r--r-- | drivers/cdrom/optcd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/cdrom/optcd.c b/drivers/cdrom/optcd.c index 351a01d..0b0eab4 100644 --- a/drivers/cdrom/optcd.c +++ b/drivers/cdrom/optcd.c @@ -264,7 +264,7 @@ static inline int flag_low(int flag, unsigned long timeout) static int sleep_timeout; /* max # of ticks to sleep */ static DECLARE_WAIT_QUEUE_HEAD(waitq); static void sleep_timer(unsigned long data); -static struct timer_list delay_timer = TIMER_INITIALIZER(sleep_timer, 0, 0); +static DEFINE_TIMER(delay_timer, sleep_timer, 0, 0); static DEFINE_SPINLOCK(optcd_lock); static struct request_queue *opt_queue; |