diff options
| author | Ingo Molnar <mingo@elte.hu> | 2005-09-09 16:10:40 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-09 17:03:48 -0400 |
| commit | 8d06afab73a75f40ae2864e6c296356bab1ab473 (patch) | |
| tree | 1d9c8c24a1024a12a4e8df841fba5809fa914356 /drivers/block/ps2esdi.c | |
| parent | 7c352bdf048811b8128019ffc1e886161e09c11c (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/block/ps2esdi.c')
| -rw-r--r-- | drivers/block/ps2esdi.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/block/ps2esdi.c b/drivers/block/ps2esdi.c index 29548784cb7b..29d1518be72a 100644 --- a/drivers/block/ps2esdi.c +++ b/drivers/block/ps2esdi.c | |||
| @@ -99,8 +99,7 @@ static DECLARE_WAIT_QUEUE_HEAD(ps2esdi_int); | |||
| 99 | static int no_int_yet; | 99 | static int no_int_yet; |
| 100 | static int ps2esdi_drives; | 100 | static int ps2esdi_drives; |
| 101 | static u_short io_base; | 101 | static u_short io_base; |
| 102 | static struct timer_list esdi_timer = | 102 | static DEFINE_TIMER(esdi_timer, ps2esdi_reset_timer, 0, 0); |
| 103 | TIMER_INITIALIZER(ps2esdi_reset_timer, 0, 0); | ||
| 104 | static int reset_status; | 103 | static int reset_status; |
| 105 | static int ps2esdi_slot = -1; | 104 | static int ps2esdi_slot = -1; |
| 106 | static int tp720esdi = 0; /* Is it Integrated ESDI of ThinkPad-720? */ | 105 | static int tp720esdi = 0; /* Is it Integrated ESDI of ThinkPad-720? */ |