diff options
author | Pavel Emelyanov <xemul@openvz.org> | 2008-01-24 00:20:07 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 17:53:35 -0500 |
commit | b24b8a247ff65c01b252025926fe564209fae4fc (patch) | |
tree | 8a9e0ea1e24b4733d8b9433d41877659505e9da4 /net/x25/x25_link.c | |
parent | a92aa318b4b369091fd80433c80e62838db8bc1c (diff) |
[NET]: Convert init_timer into setup_timer
Many-many code in the kernel initialized the timer->function
and timer->data together with calling init_timer(timer). There
is already a helper for this. Use it for networking code.
The patch is HUGE, but makes the code 130 lines shorter
(98 insertions(+), 228 deletions(-)).
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/x25/x25_link.c')
-rw-r--r-- | net/x25/x25_link.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/net/x25/x25_link.c b/net/x25/x25_link.c index 741ce95d4ad1..753f2b64abe2 100644 --- a/net/x25/x25_link.c +++ b/net/x25/x25_link.c | |||
@@ -247,10 +247,7 @@ void x25_link_device_up(struct net_device *dev) | |||
247 | return; | 247 | return; |
248 | 248 | ||
249 | skb_queue_head_init(&nb->queue); | 249 | skb_queue_head_init(&nb->queue); |
250 | 250 | setup_timer(&nb->t20timer, x25_t20timer_expiry, (unsigned long)nb); | |
251 | init_timer(&nb->t20timer); | ||
252 | nb->t20timer.data = (unsigned long)nb; | ||
253 | nb->t20timer.function = &x25_t20timer_expiry; | ||
254 | 251 | ||
255 | dev_hold(dev); | 252 | dev_hold(dev); |
256 | nb->dev = dev; | 253 | nb->dev = dev; |