samples: Convert timers to use timer_setup()

In preparation for unconditionally passing the struct timer_list pointer to
all timer callbacks, switch to using the new timer_setup() and from_timer()
to pass the timer pointer explicitly.

Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Jonathan Corbet <corbet@lwn.net>

diff --git a/samples/connector/cn_test.c b/samples/connector/cn_test.c
index d12cc944b69621e44b77a7a6f6abc8d3e6b76bb4..95cd06f4ec1ee47c017552bcf1b4f658e13c1112 100644 (file)
--- a/samples/connector/cn_test.c
+++ b/samples/connector/cn_test.c
@@ -125,12 +125,12 @@ static int cn_test_want_notify(void)
 #endif
 
 static u32 cn_test_timer_counter;
-static void cn_test_timer_func(unsigned long __data)
+static void cn_test_timer_func(struct timer_list *unused)
 {
        struct cn_msg *m;
        char data[32];
 
-       pr_debug("%s: timer fired with data %lu\n", __func__, __data);
+       pr_debug("%s: timer fired\n", __func__);
 
        m = kzalloc(sizeof(*m) + sizeof(data), GFP_ATOMIC);
        if (m) {
@@ -168,7 +168,7 @@ static int cn_test_init(void)
                goto err_out;
        }
 
-       setup_timer(&cn_test_timer, cn_test_timer_func, 0);
+       timer_setup(&cn_test_timer, cn_test_timer_func, 0);
        mod_timer(&cn_test_timer, jiffies + msecs_to_jiffies(1000));
 
        pr_info("initialized with id={%u.%u}\n",