diff options
| author | Pali Rohár <pali@kernel.org> | 2022-07-10 14:38:07 +0300 |
|---|---|---|
| committer | Heiko Schocher <hs@denx.de> | 2022-07-20 06:50:13 +0300 |
| commit | e2e6caa01ba97bcdb82100c6b928b5743e3aae6c (patch) | |
| tree | 1dd034f402699f5d4af49ae676258c1900cf3386 | |
| parent | b4f210563e63e5d4b73e3232fd7156424533063e (diff) | |
| download | u-boot-e2e6caa01ba97bcdb82100c6b928b5743e3aae6c.tar.xz | |
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>
| -rw-r--r-- | drivers/mtd/ubi/debug.h | 9 | ||||
| -rw-r--r-- | fs/ubifs/debug.h | 9 |
2 files changed, 4 insertions, 14 deletions
diff --git a/drivers/mtd/ubi/debug.h b/drivers/mtd/ubi/debug.h index 2c2faaf1b4..9c8ce51636 100644 --- 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 d69f1e6ac7..0ecc2e0c8e 100644 --- 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, ...) \ |