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/net/cris/eth_v10.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/net/cris/eth_v10.c')
-rw-r--r-- | drivers/net/cris/eth_v10.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/cris/eth_v10.c b/drivers/net/cris/eth_v10.c index 442670860fca..b68b9cad76e9 100644 --- a/drivers/net/cris/eth_v10.c +++ b/drivers/net/cris/eth_v10.c | |||
@@ -384,8 +384,8 @@ static unsigned int mdio_phy_addr; /* Transciever address */ | |||
384 | static unsigned int network_tr_ctrl_shadow = 0; | 384 | static unsigned int network_tr_ctrl_shadow = 0; |
385 | 385 | ||
386 | /* Network speed indication. */ | 386 | /* Network speed indication. */ |
387 | static struct timer_list speed_timer = TIMER_INITIALIZER(NULL, 0, 0); | 387 | static DEFINE_TIMER(speed_timer, NULL, 0, 0); |
388 | static struct timer_list clear_led_timer = TIMER_INITIALIZER(NULL, 0, 0); | 388 | static DEFINE_TIMER(clear_led_timer, NULL, 0, 0); |
389 | static int current_speed; /* Speed read from transceiver */ | 389 | static int current_speed; /* Speed read from transceiver */ |
390 | static int current_speed_selection; /* Speed selected by user */ | 390 | static int current_speed_selection; /* Speed selected by user */ |
391 | static unsigned long led_next_time; | 391 | static unsigned long led_next_time; |
@@ -393,7 +393,7 @@ static int led_active; | |||
393 | static int rx_queue_len; | 393 | static int rx_queue_len; |
394 | 394 | ||
395 | /* Duplex */ | 395 | /* Duplex */ |
396 | static struct timer_list duplex_timer = TIMER_INITIALIZER(NULL, 0, 0); | 396 | static DEFINE_TIMER(duplex_timer, NULL, 0, 0); |
397 | static int full_duplex; | 397 | static int full_duplex; |
398 | static enum duplex current_duplex; | 398 | static enum duplex current_duplex; |
399 | 399 | ||