diff options
| author | Kees Cook <keescook@chromium.org> | 2017-10-16 16:02:25 -0700 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2017-10-19 13:06:04 -0600 |
| commit | 0d6942348c71cc3246d166245e811841b7388587 (patch) | |
| tree | 9c0c01a5045192023bbff8d8e3f3b4b607772ba2 /samples | |
| parent | 7d7363e403ce959941f80684cc5f33e747afff17 (diff) | |
| download | linux-0d6942348c71cc3246d166245e811841b7388587.tar.bz2 | |
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>
Diffstat (limited to 'samples')
| -rw-r--r-- | samples/connector/cn_test.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/samples/connector/cn_test.c b/samples/connector/cn_test.c index d12cc944b696..95cd06f4ec1e 100644 --- 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", |