ubifs: Use U-Boot assert() from <log.h> in UBI/UBIFS code

U-Boot already provides assert function, so it use also in ubi and ubifs code.

Signed-off-by: Pali Rohár <pali@kernel.org>

diff --git a/drivers/mtd/ubi/debug.h b/drivers/mtd/ubi/debug.h
index 2c2faaf1b4dcc069f40139cb1efded2ab76df05d..9c8ce51636b1aa4e711dfa6689ff3f1c09c088f5 100644 (file)
--- a/drivers/mtd/ubi/debug.h
+++ b/drivers/mtd/ubi/debug.h
@@ -27,13 +27,8 @@ void ubi_dump_vid_hdr(const struct ubi_vid_hdr *vid_hdr);
        }                                                                    \
 } while (0)
 #else
-#define ubi_assert(expr)  do {                                               \
-       if (unlikely(!(expr))) {                                             \
-               pr_debug("UBI assert failed in %s at %u\n",                  \
-                      __func__, __LINE__);                                  \
-               dump_stack();                                                \
-       }                                                                    \
-} while (0)
+#include <log.h>
+#define ubi_assert(expr) assert(expr)
 #endif
 
 #define ubi_dbg_print_hex_dump(ps, pt, r, g, b, len, a)                      \

diff --git a/fs/ubifs/debug.h b/fs/ubifs/debug.h
index d69f1e6ac70b83403254a78acbdb65c3b452c1c7..0ecc2e0c8e98d3439c506e41634b841caf02acf3 100644 (file)
--- a/fs/ubifs/debug.h
+++ b/fs/ubifs/debug.h
@@ -165,14 +165,9 @@ struct ubifs_global_debug_info {
                 dbg_snprintf_key(c, key, __tmp_key_buf, DBG_KEY_BUF_LEN));    \
 } while (0)
 #else
-#define ubifs_assert(expr) do {                                                \
-       if (unlikely(!(expr))) {                                               \
-               pr_debug("UBIFS assert failed in %s at %u\n",                  \
-                      __func__, __LINE__);                                    \
-               dump_stack();                                                  \
-       }                                                                      \
-} while (0)
 
+#include <log.h>
+#define ubifs_assert(expr) assert(expr)
 #define ubifs_assert_cmt_locked(c) do { } while (0)
 
 #define ubifs_dbg_msg(type, fmt, ...) \