diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-09 19:21:15 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-09 19:21:15 -0800 |
commit | 44dbf058de9f46cf112518c99bb1352e8350ceb3 (patch) | |
tree | 2984b64f9ad7f182870ef245d62cace7aea1575a | |
parent | 15763db134dd60504dbd93137e6654f06d639acf (diff) | |
parent | 9da7dae94fb8adab5cc5f395640e30736a66e910 (diff) |
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
-rw-r--r-- | include/linux/workqueue.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h index b996e6cde6bb..74db135f9957 100644 --- a/include/linux/workqueue.h +++ b/include/linux/workqueue.h @@ -220,14 +220,10 @@ static inline unsigned int work_static(struct work_struct *work) { return 0; } #endif #define INIT_WORK(_work, _func) \ - do { \ - __INIT_WORK((_work), (_func), 0); \ - } while (0) + __INIT_WORK((_work), (_func), 0) #define INIT_WORK_ONSTACK(_work, _func) \ - do { \ - __INIT_WORK((_work), (_func), 1); \ - } while (0) + __INIT_WORK((_work), (_func), 1) #define __INIT_DELAYED_WORK(_work, _func, _tflags) \ do { \ |