mtd: replace MTDDEBUG() with pr_debug()
Subsystems (5)
PATCH 1/2 mtd: replace MTDDEBUG() with pr_debug()
In old days, the MTD subsystem in Linux had debug facility like DEBUG(MTD_DEBUG_LEVEL1, ...).
They were all replaced with pr_debug() until Linux 3.2. See Linux commit 289c05222172 ("mtd: replace DEBUG() with pr_debug()").
U-Boot still uses similar macros. Covert all of them for easier sync.
Done with the help of Coccinelle.
The semantic patch I used is as follows:
// <smpl>
@@
expression e1, e2;
@@
-MTDDEBUG(e1, e2)
+pr_debug(e2)
@@
expression e1, e2;
@@
-MTDDEBUG(e1, e2,
+pr_debug(e2,
...)
// </smpl>
---
drivers/mtd/nand/atmel_nand.c | 7 +++--- drivers/mtd/nand/davinci_nand.c | 7 +++--- drivers/mtd/nand/mxc_nand.c | 49 ++++++++++++++++---------------------- drivers/mtd/nand/nand_bch.c | 4 ++-- drivers/mtd/onenand/onenand_base.c | 38 +++++++++++++++-------------- drivers/mtd/onenand/onenand_bbt.c | 5 ++-- 6 files changed, 51 insertions(+), 59 deletions(-)
drivers/mtd/nand/atmel_nand.c +3 -4
@@ -702,7 +702,7 @@ static int pmecc_choose_ecc(struct atmel_nand_host *host,if (chip->onfi_version) { *cap = chip->ecc_strength_ds; *sector_size = chip->ecc_step_ds; -MTDDEBUG (MTD_DEBUG_LEVEL1 ,"ONFI params, minimum required ECC: %d bits in %d bytes\n" , +pr_debug ("ONFI params, minimum required ECC: %d bits in %d bytes\n" , *cap, *sector_size); }
@@ -863,9 +863,8 @@ static int atmel_pmecc_nand_init_params(struct nand_chip *nand, host->pmecc_index_table_offset =ATMEL_PMECC_INDEX_OFFSET_1024 ;#endif -MTDDEBUG (MTD_DEBUG_LEVEL1 , -"Initialize PMECC params, cap: %d, sector: %d\n" , - cap, sector_size); +pr_debug ("Initialize PMECC params, cap: %d, sector: %d\n" , + cap, sector_size); host->pmecc = (struct pmecc_regs __iomem *)ATMEL_BASE_PMECC ; host->pmerrloc = (struct pmecc_errloc_regs __iomem *)
drivers/mtd/nand/davinci_nand.c +3 -4
@@ -238,7 +238,7 @@ static int nand_davinci_correct_data(struct mtd_info *mtd, u_char *dat,uint32_t find_byte = diff >> (12 +3 ); dat[find_byte] ^= find_bit; -MTDDEBUG (MTD_DEBUG_LEVEL0 ,"Correcting single " +pr_debug ("Correcting single " "bit ECC error at offset: %d, bit: " "%d\n" , find_byte, find_bit);return 1 ;
@@ -248,12 +248,11 @@ static int nand_davinci_correct_data(struct mtd_info *mtd, u_char *dat, }else if (!(diff & (diff -1 ))) {/* Single bit ECC error in the ECC itself, nothing to fix */ -MTDDEBUG (MTD_DEBUG_LEVEL0 ,"Single bit ECC error in " -"ECC.\n" ); +pr_debug ("Single bit ECC error in " "ECC.\n" );return 1 ; }else {/* Uncorrectable error */ -MTDDEBUG (MTD_DEBUG_LEVEL0 ,"ECC UNCORRECTED_ERROR 1\n" ); +pr_debug ("ECC UNCORRECTED_ERROR 1\n" );return -EBADMSG ; } }
drivers/mtd/nand/mxc_nand.c +21 -28
139 lines not on this page · raw message
drivers/mtd/nand/nand_bch.c +2 -2
@@ -81,8 +81,8 @@ int nand_bch_correct_data(struct mtd_info *mtd, unsigned char *buf, buf[errloc[i] >>3 ] ^= (1 << (errloc[i] &7 ));/* else error in ecc, no action needed */ -MTDDEBUG (MTD_DEBUG_LEVEL0 ,"%s: corrected bitflip %u\n" , - __func__, errloc[i]); +pr_debug ("%s: corrected bitflip %u\n" , + __func__, errloc[i]); } }else if (count <0 ) {printk (KERN_ERR "ecc unrecoverable error\n" );
drivers/mtd/onenand/onenand_base.c +20 -18
@@ -858,7 +858,8 @@ static int onenand_read_ops_nolock(struct mtd_info *mtd, loff_t from,int ret =0 , boundary =0 ;int writesize = this->writesize; -MTDDEBUG (MTD_DEBUG_LEVEL3 ,"onenand_read_ops_nolock: from = 0x%08x, len = %i\n" , (unsigned int ) from, (int ) len); +pr_debug ("onenand_read_ops_nolock: from = 0x%08x, len = %i\n" , + (unsigned int ) from, (int ) len);if (ops->mode ==MTD_OPS_AUTO_OOB ) oobsize = this->ecclayout->oobavail;
@@ -1007,7 +1008,8 @@ static int onenand_read_oob_nolock(struct mtd_info *mtd, loff_t from, from += ops->ooboffs; -MTDDEBUG (MTD_DEBUG_LEVEL3 ,"onenand_read_oob_nolock: from = 0x%08x, len = %i\n" , (unsigned int ) from, (int ) len); +pr_debug ("onenand_read_oob_nolock: from = 0x%08x, len = %i\n" , + (unsigned int ) from, (int ) len);/* Initialize return length value */ ops->oobretlen =0 ;
@@ -1214,7 +1216,8 @@ int onenand_bbt_read_oob(struct mtd_info *mtd, loff_t from,size_t len = ops->ooblen;u_char *buf = ops->oobbuf; -MTDDEBUG (MTD_DEBUG_LEVEL3 ,"onenand_bbt_read_oob: from = 0x%08x, len = %zi\n" , (unsigned int ) from, len); +pr_debug ("onenand_bbt_read_oob: from = 0x%08x, len = %zi\n" , + (unsigned int ) from, len); readcmd =ONENAND_IS_4KB_PAGE (this) ?ONENAND_CMD_READ :ONENAND_CMD_READOOB ;
@@ -1417,7 +1420,8 @@ static int onenand_write_ops_nolock(struct mtd_info *mtd, loff_t to,u_char *oobbuf;int ret =0 ; -MTDDEBUG (MTD_DEBUG_LEVEL3 ,"onenand_write_ops_nolock: to = 0x%08x, len = %i\n" , (unsigned int ) to, (int ) len); +pr_debug ("onenand_write_ops_nolock: to = 0x%08x, len = %i\n" , + (unsigned int ) to, (int ) len);/* Initialize retlen, in case of early exit */ ops->retlen =0 ;
@@ -1538,7 +1542,8 @@ static int onenand_write_oob_nolock(struct mtd_info *mtd, loff_t to, to += ops->ooboffs; -MTDDEBUG (MTD_DEBUG_LEVEL3 ,"onenand_write_oob_nolock: to = 0x%08x, len = %i\n" , (unsigned int ) to, (int ) len); +pr_debug ("onenand_write_oob_nolock: to = 0x%08x, len = %i\n" , + (unsigned int ) to, (int ) len);/* Initialize retlen, in case of early exit */ ops->oobretlen =0 ;
@@ -1730,7 +1735,7 @@ int onenand_erase(struct mtd_info *mtd, struct erase_info *instr)struct mtd_erase_region_info *region =NULL ;unsigned int region_end =0 ; -MTDDEBUG (MTD_DEBUG_LEVEL3 ,"onenand_erase: start = 0x%08x, len = %i\n" , +pr_debug ("onenand_erase: start = 0x%08x, len = %i\n" , (unsigned int ) addr, len);if (FLEXONENAND (this)) {
@@ -1746,8 +1751,7 @@ int onenand_erase(struct mtd_info *mtd, struct erase_info *instr)* Erase region's start offset is always block start address. */ if (unlikely ((addr - region->offset) & (block_size -1 ))) { -MTDDEBUG (MTD_DEBUG_LEVEL0 ,"onenand_erase:" -" Unaligned address\n" ); +pr_debug ("onenand_erase:" " Unaligned address\n" );return -EINVAL ; } }else {
@@ -1755,16 +1759,14 @@ int onenand_erase(struct mtd_info *mtd, struct erase_info *instr)/* Start address must align on block boundary */ if (unlikely (addr & (block_size -1 ))) { -MTDDEBUG (MTD_DEBUG_LEVEL0 ,"onenand_erase:" -"Unaligned address\n" ); +pr_debug ("onenand_erase:" "Unaligned address\n" );return -EINVAL ; } }/* Length must align on block boundary */ if (unlikely (len & (block_size -1 ))) { -MTDDEBUG (MTD_DEBUG_LEVEL0 , -"onenand_erase: Length not block aligned\n" ); +pr_debug ("onenand_erase: Length not block aligned\n" );return -EINVAL ; }
@@ -1793,12 +1795,12 @@ int onenand_erase(struct mtd_info *mtd, struct erase_info *instr)/* Check, if it is write protected */ if (ret) {if (ret == -EPERM ) -MTDDEBUG (MTD_DEBUG_LEVEL0 ,"onenand_erase: " -"Device is write protected!!!\n" ); +pr_debug ("onenand_erase: " +"Device is write protected!!!\n" );else -MTDDEBUG (MTD_DEBUG_LEVEL0 ,"onenand_erase: " -"Failed erase, block %d\n" , -onenand_block (this, addr)); +pr_debug ("onenand_erase: " +"Failed erase, block %d\n" , +onenand_block (this, addr)); instr->state =MTD_ERASE_FAILED ; instr->fail_addr = addr;
@@ -1849,7 +1851,7 @@ erase_exit:*/ void onenand_sync (struct mtd_info *mtd) { -MTDDEBUG (MTD_DEBUG_LEVEL3 ,"onenand_sync: called\n" ); +pr_debug ("onenand_sync: called\n" );/* Grab the lock and see if the device is available */ onenand_get_device (mtd,FL_SYNCING );
drivers/mtd/onenand/onenand_bbt.c +2 -3
@@ -160,9 +160,8 @@ static int onenand_isbad_bbt(struct mtd_info *mtd, loff_t offs, int allowbbt) block = (int ) (onenand_block (this, offs) <<1 ); res = (bbm->bbt[block >>3 ] >> (block &0x06 )) &0x03 ; -MTDDEBUG (MTD_DEBUG_LEVEL2 , -"onenand_isbad_bbt: bbt info for offs 0x%08x: (block %d) 0x%02x\n" , - (unsigned int )offs, block >>1 , res); +pr_debug ("onenand_isbad_bbt: bbt info for offs 0x%08x: (block %d) 0x%02x\n" , + (unsigned int )offs, block >>1 , res);switch ((int )res) {case 0x00 :
Signature · 1 line
2.7.4
PATCH 2/2 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.
---
fs/ubifs/debug.h | 7 ------- include/configs/woodburn_common.h | 4 ---- include/linux/mtd/mtd.h | 24 ------------------------ 3 files changed, 35 deletions(-)
fs/ubifs/debug.h +0 -7
@@ -187,19 +187,12 @@ struct ubifs_global_debug_info { ##__VA_ARGS__)#define DBG_KEY_BUF_LEN 48 -#if definedCONFIG_MTD_DEBUG #define ubifs_dbg_msg_key (type, key, fmt, ...) do { \ char __tmp_key_buf[DBG_KEY_BUF_LEN]; \ pr_debug("UBIFS DBG " type ": " fmt "%s\n", \ ##__VA_ARGS__, \ dbg_snprintf_key(c, key, __tmp_key_buf, DBG_KEY_BUF_LEN)); \ } while (0) -#else -#define ubifs_dbg_msg_key (type, key, fmt, ...) do { \ - pr_debug("UBIFS DBG\n"); \ -} while (0) - -#endif #endif
include/configs/woodburn_common.h +0 -4
@@ -179,10 +179,6 @@#define CONFIG_MXC_NAND_HWECC #define CONFIG_SYS_NAND_LARGEPAGE -#if 0 -#define CONFIG_MTD_DEBUG -#define CONFIG_MTD_DEBUG_VERBOSE 7 -#endif #define CONFIG_SYS_NAND_ONFI_DETECTION /*
include/linux/mtd/mtd.h +0 -24
@@ -442,30 +442,6 @@ static inline void mtd_erase_callback(struct erase_info *instr) }#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) {return err == -EUCLEAN ; }
Signature · 1 line
2.7.4
PATCH 2/2 mtd: remove MTDDEBUG() and CONFIG_MTD_DEBUG
Quoted 9 lines · Masahiro Yamada
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 Masahiro Yamada <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20171024/f3da8515/attachment.sig>
PATCH 1/2 mtd: replace MTDDEBUG() with pr_debug()
In reply to Masahiro YamadaQuoted 26 lines · Masahiro Yamada
In old days, the MTD subsystem in Linux had debug facility like
DEBUG(MTD_DEBUG_LEVEL1, ...).They were all replaced with
pr_debug()until Linux 3.2. See Linux commit289c05222172("mtd: replaceDEBUG()withpr_debug()").U-Boot still uses similar macros. Covert all of them for easier sync.
Done with the help of Coccinelle.
The semantic patch I used is as follows:
// <smpl>
@@
expression e1, e2;
@@(quoted diff) +1
-1-MTDDEBUG(e1, e2) +pr_debug(e2)@@
expression e1, e2;
@@(quoted diff) +1
-1-MTDDEBUG(e1, e2, +pr_debug(e2, ...)// </smpl>
Quoted 1 line
Signed-off-by Masahiro Yamada <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20171023/004c54aa/attachment.sig>