| Message ID | 1505538646-19191-5-git-send-email-yamada.masahiro@socionext.com |
|---|---|
| State | Accepted |
| Commit | 5a719f921871d852a83870b12158e00e8715647e |
| Headers | show |
| Series | Sync and consolidate Linux-derived printk, BUILD_BUG, BUG, WARN, etc. | expand |
On Sat, Sep 16, 2017 at 02:10:42PM +0900, Masahiro Yamada wrote: > This macro prevents us from using compiletime_error/assert defined > in <linux/compiler.h>. > > Now we can remove it, then we will be able to import more BUILD_BUG > macros from Linux. > > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Applied to u-boot/master, thanks! -- Tom
diff --git a/include/common.h b/include/common.h index 4eb92298a207..7ea78bde83f7 100644 --- a/include/common.h +++ b/include/common.h @@ -90,11 +90,6 @@ void __assert_fail(const char *assertion, const char *file, unsigned line, ({ if (!(x) && _DEBUG) \ __assert_fail(#x, __FILE__, __LINE__, __func__); }) -#define error(fmt, args...) do { \ - printf("ERROR: " pr_fmt(fmt) "\nat %s:%d/%s()\n", \ - ##args, __FILE__, __LINE__, __func__); \ -} while (0) - #ifndef BUG #define BUG() do { \ printf("BUG: failure at %s:%d/%s()!\n", __FILE__, __LINE__, __FUNCTION__); \
This macro prevents us from using compiletime_error/assert defined in <linux/compiler.h>. Now we can remove it, then we will be able to import more BUILD_BUG macros from Linux. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> --- Changes in v2: None include/common.h | 5 ----- 1 file changed, 5 deletions(-)