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>
This commit is contained in:
Tejun Heo 2012-08-21 13:18:23 -07:00
parent ee64e7f697
commit 203b42f731
18 changed files with 31 additions and 31 deletions

View file

@ -139,7 +139,7 @@ struct execute_work {
0, (unsigned long)&(n)), \
}
#define __DEFERRED_WORK_INITIALIZER(n, f) { \
#define __DEFERRABLE_WORK_INITIALIZER(n, f) { \
.work = __WORK_INITIALIZER((n).work, (f)), \
.timer = TIMER_DEFERRED_INITIALIZER(delayed_work_timer_fn, \
0, (unsigned long)&(n)), \
@ -151,8 +151,8 @@ struct execute_work {
#define DECLARE_DELAYED_WORK(n, f) \
struct delayed_work n = __DELAYED_WORK_INITIALIZER(n, f)
#define DECLARE_DEFERRED_WORK(n, f) \
struct delayed_work n = __DEFERRED_WORK_INITIALIZER(n, f)
#define DECLARE_DEFERRABLE_WORK(n, f) \
struct delayed_work n = __DEFERRABLE_WORK_INITIALIZER(n, f)
/*
* initialize a work item's function pointer
@ -232,7 +232,7 @@ static inline unsigned int work_static(struct work_struct *work) { return 0; }
(_work)->timer.data = (unsigned long)(_work); \
} while (0)
#define INIT_DELAYED_WORK_DEFERRABLE(_work, _func) \
#define INIT_DEFERRABLE_WORK(_work, _func) \
do { \
INIT_WORK(&(_work)->work, (_func)); \
init_timer_deferrable(&(_work)->timer); \