aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acorn
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2005-09-09 16:10:40 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-09 17:03:48 -0400
commit8d06afab73a75f40ae2864e6c296356bab1ab473 (patch)
tree1d9c8c24a1024a12a4e8df841fba5809fa914356 /drivers/acorn
parent7c352bdf048811b8128019ffc1e886161e09c11c (diff)
[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/acorn')
-rw-r--r--drivers/acorn/block/fd1772.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/acorn/block/fd1772.c b/drivers/acorn/block/fd1772.c
index c0a37d98b4f3..048542341204 100644
--- a/drivers/acorn/block/fd1772.c
+++ b/drivers/acorn/block/fd1772.c
@@ -376,19 +376,15 @@ static void do_fd_request(request_queue_t *);
376 376
377/************************* End of Prototypes **************************/ 377/************************* End of Prototypes **************************/
378 378
379static struct timer_list motor_off_timer = 379static DEFINE_TIMER(motor_off_timer, fd_motor_off_timer, 0, 0);
380 TIMER_INITIALIZER(fd_motor_off_timer, 0, 0);
381 380
382#ifdef TRACKBUFFER 381#ifdef TRACKBUFFER
383static struct timer_list readtrack_timer = 382static DEFINE_TIMER(readtrack_timer, fd_readtrack_check, 0, 0);
384 TIMER_INITIALIZER(fd_readtrack_check, 0, 0);
385#endif 383#endif
386 384
387static struct timer_list timeout_timer = 385static DEFINE_TIMER(timeout_timer, fd_times_out, 0, 0);
388 TIMER_INITIALIZER(fd_times_out, 0, 0);
389 386
390static struct timer_list fd_timer = 387static DEFINE_TIMER(fd_timer, check_change, 0, 0);
391 TIMER_INITIALIZER(check_change, 0, 0);
392 388
393/* DAG: Haven't got a clue what this is? */ 389/* DAG: Haven't got a clue what this is? */
394int stdma_islocked(void) 390int stdma_islocked(void)