diff options
| author | Ingo Molnar | 2005-09-09 22:10:40 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2005-09-09 23:03:48 +0200 |
| commit | 8d06afab73a75f40ae2864e6c296356bab1ab473 (patch) | |
| tree | 1d9c8c24a1024a12a4e8df841fba5809fa914356 /drivers/atm | |
| parent | [PATCH] FUSE: don't allow restarting of system calls (diff) | |
| download | kernel-qcow2-linux-8d06afab73a75f40ae2864e6c296356bab1ab473.tar.gz kernel-qcow2-linux-8d06afab73a75f40ae2864e6c296356bab1ab473.tar.xz kernel-qcow2-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/atm')
| -rw-r--r-- | drivers/atm/idt77105.c | 6 | ||||
| -rw-r--r-- | drivers/atm/iphase.c | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/drivers/atm/idt77105.c b/drivers/atm/idt77105.c index b8c260ed4b27..0aabfc2a59d9 100644 --- a/drivers/atm/idt77105.c +++ b/drivers/atm/idt77105.c @@ -50,10 +50,8 @@ static void idt77105_stats_timer_func(unsigned long); static void idt77105_restart_timer_func(unsigned long); -static struct timer_list stats_timer = - TIMER_INITIALIZER(idt77105_stats_timer_func, 0, 0); -static struct timer_list restart_timer = - TIMER_INITIALIZER(idt77105_restart_timer_func, 0, 0); +static DEFINE_TIMER(stats_timer, idt77105_stats_timer_func, 0, 0); +static DEFINE_TIMER(restart_timer, idt77105_restart_timer_func, 0, 0); static int start_timer = 1; static struct idt77105_priv *idt77105_all = NULL; diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c index a43575acb2c1..2e2e50e1167a 100644 --- a/drivers/atm/iphase.c +++ b/drivers/atm/iphase.c @@ -79,7 +79,7 @@ static IADEV *ia_dev[8]; static struct atm_dev *_ia_dev[8]; static int iadev_count; static void ia_led_timer(unsigned long arg); -static struct timer_list ia_timer = TIMER_INITIALIZER(ia_led_timer, 0, 0); +static DEFINE_TIMER(ia_timer, ia_led_timer, 0, 0); static int IA_TX_BUF = DFL_TX_BUFFERS, IA_TX_BUF_SZ = DFL_TX_BUF_SZ; static int IA_RX_BUF = DFL_RX_BUFFERS, IA_RX_BUF_SZ = DFL_RX_BUF_SZ; static uint IADebugFlag = /* IF_IADBG_ERR | IF_IADBG_CBR| IF_IADBG_INIT_ADAPTER |