diff options
| author | Tom Rini <trini@konsulko.com> | 2022-07-20 07:38:49 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-07-20 07:38:49 -0400 |
| commit | 88d931a71052fc8fb7b48126ae09aa875745d5ec (patch) | |
| tree | 6868c39bd5186de775080818bfe5e5c875ca1366 /drivers | |
| parent | 319d309b58f863cbb8dcb240ace6af17dc98939b (diff) | |
| parent | e2e6caa01ba97bcdb82100c6b928b5743e3aae6c (diff) | |
| download | u-boot-88d931a71052fc8fb7b48126ae09aa875745d5ec.zip u-boot-88d931a71052fc8fb7b48126ae09aa875745d5ec.tar.gz u-boot-88d931a71052fc8fb7b48126ae09aa875745d5ec.tar.bz2 | |
Merge tag 'for-v2022.10' of https://source.denx.de/u-boot/custodians/u-boot-ubiWIP/20Jul2022
ubifs changes for 2022.10
UBIFS fixes from Pali Rohar:
- ubifs: Fix ubifs_assert_cmt_locked
- ubifs: Use U-Boot assert() from <log.h>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mtd/ubi/debug.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/mtd/ubi/debug.h b/drivers/mtd/ubi/debug.h index 2c2faaf..9c8ce51 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) \ |