diff options
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); | |||
50 | static void idt77105_restart_timer_func(unsigned long); | 50 | static void idt77105_restart_timer_func(unsigned long); |
51 | 51 | ||
52 | 52 | ||
53 | static struct timer_list stats_timer = | 53 | static DEFINE_TIMER(stats_timer, idt77105_stats_timer_func, 0, 0); |
54 | TIMER_INITIALIZER(idt77105_stats_timer_func, 0, 0); | 54 | static DEFINE_TIMER(restart_timer, idt77105_restart_timer_func, 0, 0); |
55 | static struct timer_list restart_timer = | ||
56 | TIMER_INITIALIZER(idt77105_restart_timer_func, 0, 0); | ||
57 | static int start_timer = 1; | 55 | static int start_timer = 1; |
58 | static struct idt77105_priv *idt77105_all = NULL; | 56 | static struct idt77105_priv *idt77105_all = NULL; |
59 | 57 | ||
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]; | |||
79 | static struct atm_dev *_ia_dev[8]; | 79 | static struct atm_dev *_ia_dev[8]; |
80 | static int iadev_count; | 80 | static int iadev_count; |
81 | static void ia_led_timer(unsigned long arg); | 81 | static void ia_led_timer(unsigned long arg); |
82 | static struct timer_list ia_timer = TIMER_INITIALIZER(ia_led_timer, 0, 0); | 82 | static DEFINE_TIMER(ia_timer, ia_led_timer, 0, 0); |
83 | static int IA_TX_BUF = DFL_TX_BUFFERS, IA_TX_BUF_SZ = DFL_TX_BUF_SZ; | 83 | static int IA_TX_BUF = DFL_TX_BUFFERS, IA_TX_BUF_SZ = DFL_TX_BUF_SZ; |
84 | static int IA_RX_BUF = DFL_RX_BUFFERS, IA_RX_BUF_SZ = DFL_RX_BUF_SZ; | 84 | static int IA_RX_BUF = DFL_RX_BUFFERS, IA_RX_BUF_SZ = DFL_RX_BUF_SZ; |
85 | static uint IADebugFlag = /* IF_IADBG_ERR | IF_IADBG_CBR| IF_IADBG_INIT_ADAPTER | 85 | static uint IADebugFlag = /* IF_IADBG_ERR | IF_IADBG_CBR| IF_IADBG_INIT_ADAPTER |