Commit ba16490e authored by Thomas Gleixner's avatar Thomas Gleixner

timer: Convert stub timer to 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: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Kees Cook <keescook@chromium.org>
parent 32a6c723
...@@ -610,7 +610,7 @@ static bool timer_fixup_init(void *addr, enum debug_obj_state state) ...@@ -610,7 +610,7 @@ static bool timer_fixup_init(void *addr, enum debug_obj_state state)
} }
/* Stub timer callback for improperly used timers. */ /* Stub timer callback for improperly used timers. */
static void stub_timer(unsigned long data) static void stub_timer(struct timer_list *unused)
{ {
WARN_ON(1); WARN_ON(1);
} }
...@@ -626,7 +626,7 @@ static bool timer_fixup_activate(void *addr, enum debug_obj_state state) ...@@ -626,7 +626,7 @@ static bool timer_fixup_activate(void *addr, enum debug_obj_state state)
switch (state) { switch (state) {
case ODEBUG_STATE_NOTAVAILABLE: case ODEBUG_STATE_NOTAVAILABLE:
setup_timer(timer, stub_timer, 0); timer_setup(timer, stub_timer, 0);
return true; return true;
case ODEBUG_STATE_ACTIVE: case ODEBUG_STATE_ACTIVE:
...@@ -665,7 +665,7 @@ static bool timer_fixup_assert_init(void *addr, enum debug_obj_state state) ...@@ -665,7 +665,7 @@ static bool timer_fixup_assert_init(void *addr, enum debug_obj_state state)
switch (state) { switch (state) {
case ODEBUG_STATE_NOTAVAILABLE: case ODEBUG_STATE_NOTAVAILABLE:
setup_timer(timer, stub_timer, 0); timer_setup(timer, stub_timer, 0);
return true; return true;
default: default:
return false; return false;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment