Update WARN_ON() to return a value

In linux v4.9 this returns a value. This saves checking the warning
condition twice in some code.

Update the U-Boot version to do this also.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/include/linux/compat.h b/include/linux/compat.h
index a43e4d66983dd9a996eb1a21fd44ce5df6357cea..03f9bef0dae8a2c44f91fbed9af7dba122a7628d 100644 (file)
--- a/include/linux/compat.h
+++ b/include/linux/compat.h
@@ -106,8 +106,12 @@ static inline void kmem_cache_destroy(struct kmem_cache *cachep)
 #define BUG_ON(condition) do { if (condition) BUG(); } while(0)
 #endif /* BUG */
 
-#define WARN_ON(x) if (x) {printf("WARNING in %s line %d\n" \
-                                 , __FILE__, __LINE__); }
+#define WARN_ON(condition) ({                                          \
+       int __ret_warn_on = !!(condition);                              \
+       if (unlikely(__ret_warn_on))                                    \
+               printf("WARNING in %s line %d\n", __FILE__, __LINE__);; \
+       unlikely(__ret_warn_on);                                        \
+})
 
 #define PAGE_SIZE      4096