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/sbpcd.c | |
| parent | 7c352bdf048811b8128019ffc1e886161e09c11c (diff) | |
| download | blackbird-op-linux-8d06afab73a75f40ae2864e6c296356bab1ab473.tar.gz blackbird-op-linux-8d06afab73a75f40ae2864e6c296356bab1ab473.zip | |
[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/sbpcd.c')
| -rw-r--r-- | drivers/cdrom/sbpcd.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/cdrom/sbpcd.c b/drivers/cdrom/sbpcd.c index 452d34675159..30a897755361 100644 --- a/drivers/cdrom/sbpcd.c +++ b/drivers/cdrom/sbpcd.c @@ -742,13 +742,10 @@ static struct sbpcd_drive *current_drive = D_S; unsigned long cli_sti; /* for saving the processor flags */ #endif /*==========================================================================*/ -static struct timer_list delay_timer = - TIMER_INITIALIZER(mark_timeout_delay, 0, 0); -static struct timer_list data_timer = - TIMER_INITIALIZER(mark_timeout_data, 0, 0); +static DEFINE_TIMER(delay_timer, mark_timeout_delay, 0, 0); +static DEFINE_TIMER(data_timer, mark_timeout_data, 0, 0); #if 0 -static struct timer_list audio_timer = - TIMER_INITIALIZER(mark_timeout_audio, 0, 0); +static DEFINE_TIMER(audio_timer, mark_timeout_audio, 0, 0); #endif /*==========================================================================*/ /* |
