diff mbox series

[1/2] genl_magic: remove own BUILD_BUG_ON*() defines

Message ID 1515121833-3174-2-git-send-email-yamada.masahiro@socionext.com
State Accepted
Commit 075db40c3b3d13a25c70e315c210bec921a198a5
Headers show
Series Consolidate BUILD_BUG macros | expand

Commit Message

Masahiro Yamada Jan. 5, 2018, 3:10 a.m. UTC 
Do not duplicate BUILD_BUG_ON*.  Use ones from <linux/build_bug.h>.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

---

 include/linux/genl_magic_func.h | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

-- 
2.7.4
diff mbox series

Patch

diff --git a/include/linux/genl_magic_func.h b/include/linux/genl_magic_func.h
index 6049676..83f81ac 100644
--- a/include/linux/genl_magic_func.h
+++ b/include/linux/genl_magic_func.h
@@ -2,6 +2,7 @@ 
 #ifndef GENL_MAGIC_FUNC_H
 #define GENL_MAGIC_FUNC_H
 
+#include <linux/build_bug.h>
 #include <linux/genl_magic_struct.h>
 
 /*
@@ -132,17 +133,6 @@  static void dprint_array(const char *dir, int nla_type,
  * use one static buffer for parsing of nested attributes */
 static struct nlattr *nested_attr_tb[128];
 
-#ifndef BUILD_BUG_ON
-/* Force a compilation error if condition is true */
-#define BUILD_BUG_ON(condition) ((void)BUILD_BUG_ON_ZERO(condition))
-/* Force a compilation error if condition is true, but also produce a
-   result (of value 0 and type size_t), so the expression can be used
-   e.g. in a structure initializer (or where-ever else comma expressions
-   aren't permitted). */
-#define BUILD_BUG_ON_ZERO(e) (sizeof(struct { int:-!!(e); }))
-#define BUILD_BUG_ON_NULL(e) ((void *)sizeof(struct { int:-!!(e); }))
-#endif
-
 #undef GENL_struct
 #define GENL_struct(tag_name, tag_number, s_name, s_fields)		\
 /* *_from_attrs functions are static, but potentially unused */		\