Skip to content

Commit

Permalink
Merge branch 'for-3.20' of git://git.kernel.org/pub/scm/linux/kernel/…
Browse files Browse the repository at this point in the history
…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
  • Loading branch information
Linus Torvalds committed Feb 10, 2015
2 parents 15763db + 9da7dae commit 44dbf05
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions include/linux/workqueue.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 { \
Expand Down

0 comments on commit 44dbf05

Please sign in to comment.