提交 8b7f4b9c 编写于 作者: M Masahiro Yamada 提交者: Tom Rini

mtd: remove MTDDEBUG() and CONFIG_MTD_DEBUG

All users of this macro have been converted.  Remove MTDDEBUG and
related CONFIG options.

ubifs_dbg_msg_key() is kept.  It is silent unless DEBUG is defined.

I am not touching scripts/config_whitelist.txt.  The deprecated options
will be dropped by the next resync.
Signed-off-by: NMasahiro Yamada <yamada.masahiro@socionext.com>
上级 166cae20
...@@ -187,19 +187,12 @@ struct ubifs_global_debug_info { ...@@ -187,19 +187,12 @@ struct ubifs_global_debug_info {
##__VA_ARGS__) ##__VA_ARGS__)
#define DBG_KEY_BUF_LEN 48 #define DBG_KEY_BUF_LEN 48
#if defined CONFIG_MTD_DEBUG
#define ubifs_dbg_msg_key(type, key, fmt, ...) do { \ #define ubifs_dbg_msg_key(type, key, fmt, ...) do { \
char __tmp_key_buf[DBG_KEY_BUF_LEN]; \ char __tmp_key_buf[DBG_KEY_BUF_LEN]; \
pr_debug("UBIFS DBG " type ": " fmt "%s\n", \ pr_debug("UBIFS DBG " type ": " fmt "%s\n", \
##__VA_ARGS__, \ ##__VA_ARGS__, \
dbg_snprintf_key(c, key, __tmp_key_buf, DBG_KEY_BUF_LEN)); \ dbg_snprintf_key(c, key, __tmp_key_buf, DBG_KEY_BUF_LEN)); \
} while (0) } while (0)
#else
#define ubifs_dbg_msg_key(type, key, fmt, ...) do { \
pr_debug("UBIFS DBG\n"); \
} while (0)
#endif
#endif #endif
......
...@@ -178,10 +178,6 @@ ...@@ -178,10 +178,6 @@
#define CONFIG_MXC_NAND_HWECC #define CONFIG_MXC_NAND_HWECC
#define CONFIG_SYS_NAND_LARGEPAGE #define CONFIG_SYS_NAND_LARGEPAGE
#if 0
#define CONFIG_MTD_DEBUG
#define CONFIG_MTD_DEBUG_VERBOSE 7
#endif
#define CONFIG_SYS_NAND_ONFI_DETECTION #define CONFIG_SYS_NAND_ONFI_DETECTION
/* /*
......
...@@ -442,30 +442,6 @@ static inline void mtd_erase_callback(struct erase_info *instr) ...@@ -442,30 +442,6 @@ static inline void mtd_erase_callback(struct erase_info *instr)
} }
#endif #endif
#ifdef __UBOOT__
/*
* Debugging macro and defines
*/
#define MTD_DEBUG_LEVEL0 (0) /* Quiet */
#define MTD_DEBUG_LEVEL1 (1) /* Audible */
#define MTD_DEBUG_LEVEL2 (2) /* Loud */
#define MTD_DEBUG_LEVEL3 (3) /* Noisy */
#ifdef CONFIG_MTD_DEBUG
#define MTDDEBUG(n, args...) \
do { \
if (n <= CONFIG_MTD_DEBUG_VERBOSE) \
printk(KERN_INFO args); \
} while(0)
#else /* CONFIG_MTD_DEBUG */
#define MTDDEBUG(n, args...) \
do { \
if (0) \
printk(KERN_INFO args); \
} while(0)
#endif /* CONFIG_MTD_DEBUG */
#endif
static inline int mtd_is_bitflip(int err) { static inline int mtd_is_bitflip(int err) {
return err == -EUCLEAN; return err == -EUCLEAN;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册