summaryrefslogtreecommitdiffstats
path: root/drivers/cdrom/gscd.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2005-09-09 22:10:40 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-09 23:03:48 +0200
commit8d06afab73a75f40ae2864e6c296356bab1ab473 (patch)
tree1d9c8c24a1024a12a4e8df841fba5809fa914356 /drivers/cdrom/gscd.c
parent[PATCH] FUSE: don't allow restarting of system calls (diff)
downloadlinux-8d06afab73a75f40ae2864e6c296356bab1ab473.tar.xz
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/gscd.c')
-rw-r--r--drivers/cdrom/gscd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/cdrom/gscd.c b/drivers/cdrom/gscd.c
index 7eac10e63b23..ad5464ab99bc 100644
--- a/drivers/cdrom/gscd.c
+++ b/drivers/cdrom/gscd.c
@@ -146,7 +146,7 @@ static int AudioStart_f;
static int AudioEnd_m;
static int AudioEnd_f;
-static struct timer_list gscd_timer = TIMER_INITIALIZER(NULL, 0, 0);
+static DEFINE_TIMER(gscd_timer, NULL, 0, 0);
static DEFINE_SPINLOCK(gscd_lock);
static struct request_queue *gscd_queue;