Commit 44dbf058 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'for-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq

Pull workqueue changes from Tejun Heo:
 "One cosmetic cleanup patch"

* 'for-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
  workqueue.h: remove loops of single statement macros
parents 15763db1 9da7dae9
...@@ -220,14 +220,10 @@ static inline unsigned int work_static(struct work_struct *work) { return 0; } ...@@ -220,14 +220,10 @@ static inline unsigned int work_static(struct work_struct *work) { return 0; }
#endif #endif
#define INIT_WORK(_work, _func) \ #define INIT_WORK(_work, _func) \
do { \ __INIT_WORK((_work), (_func), 0)
__INIT_WORK((_work), (_func), 0); \
} while (0)
#define INIT_WORK_ONSTACK(_work, _func) \ #define INIT_WORK_ONSTACK(_work, _func) \
do { \ __INIT_WORK((_work), (_func), 1)
__INIT_WORK((_work), (_func), 1); \
} while (0)
#define __INIT_DELAYED_WORK(_work, _func, _tflags) \ #define __INIT_DELAYED_WORK(_work, _func, _tflags) \
do { \ do { \
......
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