aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/workqueue.h
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2012-08-21 16:18:23 -0400
committerTejun Heo <tj@kernel.org>2012-08-21 16:18:23 -0400
commit203b42f7317494ae5e5efc7be6fb7f29c927f102 (patch)
tree5636bc6da58284977678e0d2c2accc2573260a53 /include/linux/workqueue.h
parentee64e7f697ad7e5575e6ac8900cfb71975484421 (diff)
workqueue: make deferrable delayed_work initializer names consistent
Initalizers for deferrable delayed_work are confused. * __DEFERRED_WORK_INITIALIZER() * DECLARE_DEFERRED_WORK() * INIT_DELAYED_WORK_DEFERRABLE() Rename them to * __DEFERRABLE_WORK_INITIALIZER() * DECLARE_DEFERRABLE_WORK() * INIT_DEFERRABLE_WORK() This patch doesn't cause any functional changes. Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'include/linux/workqueue.h')
-rw-r--r--include/linux/workqueue.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h
index 26c5b4c63861..49a9c51f9ee3 100644
--- a/include/linux/workqueue.h
+++ b/include/linux/workqueue.h
@@ -139,7 +139,7 @@ struct execute_work {
139 0, (unsigned long)&(n)), \ 139 0, (unsigned long)&(n)), \
140 } 140 }
141 141
142#define __DEFERRED_WORK_INITIALIZER(n, f) { \ 142#define __DEFERRABLE_WORK_INITIALIZER(n, f) { \
143 .work = __WORK_INITIALIZER((n).work, (f)), \ 143 .work = __WORK_INITIALIZER((n).work, (f)), \
144 .timer = TIMER_DEFERRED_INITIALIZER(delayed_work_timer_fn, \ 144 .timer = TIMER_DEFERRED_INITIALIZER(delayed_work_timer_fn, \
145 0, (unsigned long)&(n)), \ 145 0, (unsigned long)&(n)), \
@@ -151,8 +151,8 @@ struct execute_work {
151#define DECLARE_DELAYED_WORK(n, f) \ 151#define DECLARE_DELAYED_WORK(n, f) \
152 struct delayed_work n = __DELAYED_WORK_INITIALIZER(n, f) 152 struct delayed_work n = __DELAYED_WORK_INITIALIZER(n, f)
153 153
154#define DECLARE_DEFERRED_WORK(n, f) \ 154#define DECLARE_DEFERRABLE_WORK(n, f) \
155 struct delayed_work n = __DEFERRED_WORK_INITIALIZER(n, f) 155 struct delayed_work n = __DEFERRABLE_WORK_INITIALIZER(n, f)
156 156
157/* 157/*
158 * initialize a work item's function pointer 158 * initialize a work item's function pointer
@@ -232,7 +232,7 @@ static inline unsigned int work_static(struct work_struct *work) { return 0; }
232 (_work)->timer.data = (unsigned long)(_work); \ 232 (_work)->timer.data = (unsigned long)(_work); \
233 } while (0) 233 } while (0)
234 234
235#define INIT_DELAYED_WORK_DEFERRABLE(_work, _func) \ 235#define INIT_DEFERRABLE_WORK(_work, _func) \
236 do { \ 236 do { \
237 INIT_WORK(&(_work)->work, (_func)); \ 237 INIT_WORK(&(_work)->work, (_func)); \
238 init_timer_deferrable(&(_work)->timer); \ 238 init_timer_deferrable(&(_work)->timer); \