[PATCH] introduce setup_timer() helper

Every user of init_timer() also needs to initialize ->function and ->data
fields.  This patch adds a simple setup_timer() helper for that.

The schedule_timeout() is patched as an example of usage.

Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 2 insertions, 6 deletions

diff --git a/kernel/timer.c b/kernel/timer.c
index 6a2e5f8dc7..6ed1a826e5 100644
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -1146,12 +1146,8 @@ fastcall signed long __sched schedule_timeout(signed long timeout)
 
         expire = timeout + jiffies;
 
-        init_timer(&timer);
-        timer.expires = expire;
-        timer.data = (unsigned long) current;
-        timer.function = process_timeout;
-
-        add_timer(&timer);
+        setup_timer(&timer, process_timeout, (unsigned long)current);
+        __mod_timer(&timer, expire);
         schedule();
         del_singleshot_timer_sync(&timer);