[NET]: Convert init_timer into setup_timer

[linux-2.6-block.git] / net / tipc / core.h

diff --git a/net/tipc/core.h b/net/tipc/core.h
index e40ada964d6e9ce4794b30c98ab6f2516ac70427..feabca5808201be3083b015ae15ced8012574bfe 100644 (file)
--- a/net/tipc/core.h
+++ b/net/tipc/core.h
@@ -212,9 +212,7 @@ static inline void k_init_timer(struct timer_list *timer, Handler routine,
                                unsigned long argument)
 {
        dbg("initializing timer %p\n", timer);
-       init_timer(timer);
-       timer->function = routine;
-       timer->data = argument;
+       setup_timer(timer, routine, argument);
 }
 
 /**