hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Kees Cook 2017-10-16 16:02:25 -07:00 committed by Jonathan Corbet
parent 7d7363e403
commit 0d6942348c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
samples/connector/cn_test.c
View File

@ -125,12 +125,12 @@ static int cn_test_want_notify(void)
#endif #endif
static u32 cn_test_timer_counter; 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; struct cn_msg *m;
char data[32]; 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); m = kzalloc(sizeof(*m) + sizeof(data), GFP_ATOMIC);
if (m) { if (m) {
@ -168,7 +168,7 @@ static int cn_test_init(void)
goto err_out; 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)); mod_timer(&cn_test_timer, jiffies + msecs_to_jiffies(1000));
pr_info("initialized with id={%u.%u}\n", pr_info("initialized with id={%u.%u}\n",