diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-05-12 21:05:59 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-05-12 21:05:59 +0000 |
| commit | ba2dacab305c598cd4c34a604f8e276bf5bab5ff (patch) | |
| tree | 78670a0139bf4d5ace617b29b7eba82bbc74d602 /drivers/block/amiflop.c | |
| parent | b77bf69998121e689c5e86cc5630d39a0a9ee6ca (diff) | |
Merge with Linux 2.3.99-pre7 and various other bits.
Diffstat (limited to 'drivers/block/amiflop.c')
| -rw-r--r-- | drivers/block/amiflop.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/block/amiflop.c b/drivers/block/amiflop.c index 0c7af176e..095fc0870 100644 --- a/drivers/block/amiflop.c +++ b/drivers/block/amiflop.c @@ -1824,19 +1824,16 @@ int __init amiga_floppy_init(void) } /* initialize variables */ - motor_on_timer.next = NULL; - motor_on_timer.prev = NULL; + init_timer(&motor_on_timer); motor_on_timer.expires = 0; motor_on_timer.data = 0; motor_on_timer.function = motor_on_callback; for (i = 0; i < FD_MAX_UNITS; i++) { - motor_off_timer[i].next = NULL; - motor_off_timer[i].prev = NULL; + init_timer(&motor_off_timer[i]); motor_off_timer[i].expires = 0; motor_off_timer[i].data = i|0x80000000; motor_off_timer[i].function = fd_motor_off; - flush_track_timer[i].next = NULL; - flush_track_timer[i].prev = NULL; + init_timer(&flush_track_timer[i]); flush_track_timer[i].expires = 0; flush_track_timer[i].data = i; flush_track_timer[i].function = flush_track_callback; @@ -1844,8 +1841,7 @@ int __init amiga_floppy_init(void) unit[i].track = -1; } - post_write_timer.next = NULL; - post_write_timer.prev = NULL; + init_timer(&post_write_timer); post_write_timer.expires = 0; post_write_timer.data = 0; post_write_timer.function = post_write; |