Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

include/linux/workqueue.h

+2 −6
Original line number Diff line number Diff line
@@ -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 {								\