timer: Remove init_timer() interface

All users of init_timer() have been updated. Remove the ancient interface.

Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Jonathan Corbet <corbet@lwn.net>
Signed-off-by: Kees Cook <keescook@chromium.org>

diff --git a/Documentation/core-api/local_ops.rst b/Documentation/core-api/local_ops.rst
index 1062ddba62c7608bb96f4211e2a6a0863f8a47c3..2ac3f9f2984531dda8a28ac9daaf3aa3d0ea8985 100644 (file)
--- a/Documentation/core-api/local_ops.rst
+++ b/Documentation/core-api/local_ops.rst
@@ -177,18 +177,14 @@ Here is a sample module which implements a basic per cpu counter using
                     printk("Read : CPU %d, count %ld\n", cpu,
                             local_read(&per_cpu(counters, cpu)));
             }
-            del_timer(&test_timer);
-            test_timer.expires = jiffies + 1000;
-            add_timer(&test_timer);
+            mod_timer(&test_timer, jiffies + 1000);
     }
 
     static int __init test_init(void)
     {
             /* initialize the timer that will increment the counter */
-            init_timer(&test_timer);
-            test_timer.function = do_test_timer;
-            test_timer.expires = jiffies + 1;
-            add_timer(&test_timer);
+            timer_setup(&test_timer, do_test_timer, 0);
+            mod_timer(&test_timer, jiffies + 1);
 
             return 0;
     }

diff --git a/include/linux/timer.h b/include/linux/timer.h
index bf781acfc6d820f555eefed29dbcdc7c8c4f7033..a58097ea7cfccd6bfffb5aec01501856cd3e262c 100644 (file)
--- a/include/linux/timer.h
+++ b/include/linux/timer.h
@@ -117,9 +117,6 @@ static inline void init_timer_on_stack_key(struct timer_list *timer,
        init_timer_on_stack_key((_timer), (_flags), NULL, NULL)
 #endif
 
-#define init_timer(timer)                                              \
-       __init_timer((timer), 0)
-
 #define __setup_timer(_timer, _fn, _data, _flags)                      \
        do {                                                            \
                __init_timer((_timer), (_flags));                       \