瀏覽代碼

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
Linus Torvalds 10 年之前
父節點
當前提交
44dbf058de
共有 1 個文件被更改,包括 2 次插入6 次删除
  1. 2 6
      include/linux/workqueue.h

+ 2 - 6
include/linux/workqueue.h

@@ -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);			\
-	} while (0)
+	__INIT_WORK((_work), (_func), 0)
 
 
 #define INIT_WORK_ONSTACK(_work, _func)					\
 #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)			\
 #define __INIT_DELAYED_WORK(_work, _func, _tflags)			\
 	do {								\
 	do {								\