qiurui
/
rv1126-uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UPSTREAM: mtd: ubi, ubifs debug: Use pr_debug instead of pr_crit 

Before printk.h was introduced and MTDDEBUG was removed,
pr_crit() was calling MTDDEBUG(), which was since then
replaced by the current pr_debug().

pr_debug is more appropriate here.

Change-Id: Id553ff366acbb614f7a8adee6e8e46f79535be08
Signed-off-by: Eran Matityahu <eran.m@variscite.com>
Reviewed-by: Heiko Schocher <hs@denx.de>
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
(cherry picked from commit 734b080e78805edbb3430a52c8c5b1aeee02bd9f)
This commit is contained in:
Eran Matityahu 2019-02-13 20:56:17 +02:00 committed by Kever Yang
parent 8ea7412056
commit 955a06fc55
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/mtd/ubi/debug.h
View File

@ -30,7 +30,7 @@ void ubi_dump_vid_hdr(const struct ubi_vid_hdr *vid_hdr);
#else #else
#define ubi_assert(expr) do { \ #define ubi_assert(expr) do { \
if (unlikely(!(expr))) { \ if (unlikely(!(expr))) { \
pr_crit("UBI assert failed in %s at %u\n", \ pr_debug("UBI assert failed in %s at %u\n", \
__func__, __LINE__); \ __func__, __LINE__); \
dump_stack(); \ dump_stack(); \
} \ } \

4
fs/ubifs/debug.h
View File

@ -168,7 +168,7 @@ struct ubifs_global_debug_info {
#else #else
#define ubifs_assert(expr) do { \ #define ubifs_assert(expr) do { \
if (unlikely(!(expr))) { \ if (unlikely(!(expr))) { \
pr_crit("UBIFS assert failed in %s at %u\n", \ pr_debug("UBIFS assert failed in %s at %u\n", \
__func__, __LINE__); \ __func__, __LINE__); \
dump_stack(); \ dump_stack(); \
} \ } \
@ -177,7 +177,7 @@ struct ubifs_global_debug_info {
#define ubifs_assert_cmt_locked(c) do { \ #define ubifs_assert_cmt_locked(c) do { \
if (unlikely(down_write_trylock(&(c)->commit_sem))) { \ if (unlikely(down_write_trylock(&(c)->commit_sem))) { \
up_write(&(c)->commit_sem); \ up_write(&(c)->commit_sem); \
pr_crit("commit lock is not locked!\n"); \ pr_debug("commit lock is not locked!\n"); \
ubifs_assert(0); \ ubifs_assert(0); \
} \ } \
} while (0) } while (0)