summaryrefslogtreecommitdiffstats
path: root/include/linux/kthread.h
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2017-10-22 18:48:43 -0700
committerKees Cook <keescook@chromium.org>2017-11-21 15:57:15 -0800
commit919b250f8570618e84af544c3e18dad5210eb9b6 (patch)
tree1d40f3839c10ee62e70b5db4ac5ba30aa3e4a1c0 /include/linux/kthread.h
parent188665b2d67db8953899551d1a9d4481b2a0ac60 (diff)
downloadlinux-919b250f8570618e84af544c3e18dad5210eb9b6.tar.gz
linux-919b250f8570618e84af544c3e18dad5210eb9b6.tar.bz2
linux-919b250f8570618e84af544c3e18dad5210eb9b6.zip
timer: Remove redundant __setup_timer*() macros
With __init_timer*() now matching __setup_timer*(), remove the redundant internal interface, clean up the resulting definitions and add more documentation. Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Tejun Heo <tj@kernel.org> Cc: Lai Jiangshan <jiangshanlai@gmail.com> Cc: Shaohua Li <shli@fb.com> Cc: Jens Axboe <axboe@kernel.dk> Cc: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Kees Cook <keescook@chromium.org>
Diffstat (limited to 'include/linux/kthread.h')
-rw-r--r--include/linux/kthread.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/kthread.h b/include/linux/kthread.h
index b855c5b72b26..dc850d257ea2 100644
--- a/include/linux/kthread.h
+++ b/include/linux/kthread.h
@@ -164,9 +164,9 @@ extern void __kthread_init_worker(struct kthread_worker *worker,
#define kthread_init_delayed_work(dwork, fn) \
do { \
kthread_init_work(&(dwork)->work, (fn)); \
- __setup_timer(&(dwork)->timer, \
- (TIMER_FUNC_TYPE)kthread_delayed_work_timer_fn,\
- TIMER_IRQSAFE); \
+ __init_timer(&(dwork)->timer, \
+ kthread_delayed_work_timer_fn, \
+ TIMER_IRQSAFE); \
} while (0)
int kthread_worker_fn(void *worker_ptr);