summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2017-10-22 19:15:40 -0700
committerKees Cook <keescook@chromium.org>2017-11-21 15:57:13 -0800
commit354b46b1a0adda1dd5b7f0bc2a5604cca091be5f (patch)
tree337614b13dad20aa1c591c4392ca1302d322096a /kernel
parentc1eba5bcb6430868427e0b9d1cd1205a07302f06 (diff)
downloadop-kernel-dev-354b46b1a0adda1dd5b7f0bc2a5604cca091be5f.zip
op-kernel-dev-354b46b1a0adda1dd5b7f0bc2a5604cca091be5f.tar.gz
timer: Switch callback prototype to take struct timer_list * argument
Since all callbacks have been converted, we can switch the core prototype to "struct timer_list *" now too. Cc: Thomas Gleixner <tglx@linutronix.de> Cc: John Stultz <john.stultz@linaro.org> Cc: Stephen Boyd <sboyd@codeaurora.org> Signed-off-by: Kees Cook <keescook@chromium.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/time/timer.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/time/timer.c b/kernel/time/timer.c
index a07eb12..0f0d49a 100644
--- a/kernel/time/timer.c
+++ b/kernel/time/timer.c
@@ -1284,7 +1284,7 @@ int del_timer_sync(struct timer_list *timer)
EXPORT_SYMBOL(del_timer_sync);
#endif
-static void call_timer_fn(struct timer_list *timer, void (*fn)(unsigned long))
+static void call_timer_fn(struct timer_list *timer, void (*fn)(struct timer_list *))
{
int count = preempt_count();
@@ -1308,7 +1308,7 @@ static void call_timer_fn(struct timer_list *timer, void (*fn)(unsigned long))
lock_map_acquire(&lockdep_map);
trace_timer_expire_entry(timer);
- fn((TIMER_DATA_TYPE)timer);
+ fn(timer);
trace_timer_expire_exit(timer);
lock_map_release(&lockdep_map);
@@ -1330,7 +1330,7 @@ static void expire_timers(struct timer_base *base, struct hlist_head *head)
{
while (!hlist_empty(head)) {
struct timer_list *timer;
- void (*fn)(unsigned long);
+ void (*fn)(struct timer_list *);
timer = hlist_entry(head->first, struct timer_list, entry);
OpenPOWER on IntegriCloud