Commit 13e859745cf8cf0e6602759b1ef2abcb9ced7991
Committed by
David Woodhouse
1 parent
513d57e1db
Exists in
smarc-l5.0.0_1.0.0-ga
and in
5 other branches
mtd: use %*ph[CN] to dump small buffers
There is new format specified that helps to dump small buffers. It makes the code simpler and nicer. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Acked-by: Jiandong Zheng <jdzheng@broadcom.com> Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Showing 4 changed files with 14 additions and 41 deletions Side-by-side Diff
drivers/mtd/devices/doc2001plus.c
... | ... | @@ -659,23 +659,15 @@ |
659 | 659 | #ifdef ECC_DEBUG |
660 | 660 | printk("%s(%d): Millennium Plus ECC error (from=0x%x:\n", |
661 | 661 | __FILE__, __LINE__, (int)from); |
662 | - printk(" syndrome= %02x:%02x:%02x:%02x:%02x:" | |
663 | - "%02x\n", | |
664 | - syndrome[0], syndrome[1], syndrome[2], | |
665 | - syndrome[3], syndrome[4], syndrome[5]); | |
666 | - printk(" eccbuf= %02x:%02x:%02x:%02x:%02x:" | |
667 | - "%02x\n", | |
668 | - eccbuf[0], eccbuf[1], eccbuf[2], | |
669 | - eccbuf[3], eccbuf[4], eccbuf[5]); | |
662 | + printk(" syndrome= %*phC\n", 6, syndrome); | |
663 | + printk(" eccbuf= %*phC\n", 6, eccbuf); | |
670 | 664 | #endif |
671 | 665 | ret = -EIO; |
672 | 666 | } |
673 | 667 | } |
674 | 668 | |
675 | 669 | #ifdef PSYCHO_DEBUG |
676 | - printk("ECC DATA at %lx: %2.2X %2.2X %2.2X %2.2X %2.2X %2.2X\n", | |
677 | - (long)from, eccbuf[0], eccbuf[1], eccbuf[2], eccbuf[3], | |
678 | - eccbuf[4], eccbuf[5]); | |
670 | + printk("ECC DATA at %lx: %*ph\n", (long)from, 6, eccbuf); | |
679 | 671 | #endif |
680 | 672 | /* disable the ECC engine */ |
681 | 673 | WriteDOC(DOC_ECC_DIS, docptr , Mplus_ECCConf); |
drivers/mtd/devices/docg3.c
... | ... | @@ -919,19 +919,13 @@ |
919 | 919 | eccconf1 = doc_register_readb(docg3, DOC_ECCCONF1); |
920 | 920 | |
921 | 921 | if (nboob >= DOC_LAYOUT_OOB_SIZE) { |
922 | - doc_dbg("OOB - INFO: %02x:%02x:%02x:%02x:%02x:%02x:%02x\n", | |
923 | - oobbuf[0], oobbuf[1], oobbuf[2], oobbuf[3], | |
924 | - oobbuf[4], oobbuf[5], oobbuf[6]); | |
922 | + doc_dbg("OOB - INFO: %*phC\n", 7, oobbuf); | |
925 | 923 | doc_dbg("OOB - HAMMING: %02x\n", oobbuf[7]); |
926 | - doc_dbg("OOB - BCH_ECC: %02x:%02x:%02x:%02x:%02x:%02x:%02x\n", | |
927 | - oobbuf[8], oobbuf[9], oobbuf[10], oobbuf[11], | |
928 | - oobbuf[12], oobbuf[13], oobbuf[14]); | |
924 | + doc_dbg("OOB - BCH_ECC: %*phC\n", 7, oobbuf + 8); | |
929 | 925 | doc_dbg("OOB - UNUSED: %02x\n", oobbuf[15]); |
930 | 926 | } |
931 | 927 | doc_dbg("ECC checks: ECCConf1=%x\n", eccconf1); |
932 | - doc_dbg("ECC HW_ECC: %02x:%02x:%02x:%02x:%02x:%02x:%02x\n", | |
933 | - hwecc[0], hwecc[1], hwecc[2], hwecc[3], hwecc[4], | |
934 | - hwecc[5], hwecc[6]); | |
928 | + doc_dbg("ECC HW_ECC: %*phC\n", 7, hwecc); | |
935 | 929 | |
936 | 930 | ret = -EIO; |
937 | 931 | if (is_prot_seq_error(docg3)) |
drivers/mtd/nand/bcm_umi_bch.c
... | ... | @@ -154,19 +154,10 @@ |
154 | 154 | #if defined(NAND_BCM_UMI_DEBUG) |
155 | 155 | printk(KERN_WARNING "%s uncorr_err sectorIdx=%d\n", |
156 | 156 | __func__, sectorIdx); |
157 | - printk(KERN_WARNING | |
158 | - "%s data %02x %02x %02x %02x " | |
159 | - "%02x %02x %02x %02x\n", | |
160 | - __func__, datap[0], datap[1], datap[2], datap[3], | |
161 | - datap[4], datap[5], datap[6], datap[7]); | |
162 | - printk(KERN_WARNING | |
163 | - "%s ecc %02x %02x %02x %02x " | |
164 | - "%02x %02x %02x %02x %02x %02x " | |
165 | - "%02x %02x %02x\n", | |
166 | - __func__, eccCalc[0], eccCalc[1], eccCalc[2], | |
167 | - eccCalc[3], eccCalc[4], eccCalc[5], eccCalc[6], | |
168 | - eccCalc[7], eccCalc[8], eccCalc[9], eccCalc[10], | |
169 | - eccCalc[11], eccCalc[12]); | |
157 | + printk(KERN_WARNING "%s data %*ph\n", | |
158 | + __func__, 8, datap); | |
159 | + printk(KERN_WARNING "%s ecc %*ph\n", | |
160 | + __func__, 13, eccCalc); | |
170 | 161 | BUG(); |
171 | 162 | #endif |
172 | 163 | mtd->ecc_stats.failed++; |
drivers/mtd/nand/s3c2410.c
... | ... | @@ -457,10 +457,8 @@ |
457 | 457 | diff1 = read_ecc[1] ^ calc_ecc[1]; |
458 | 458 | diff2 = read_ecc[2] ^ calc_ecc[2]; |
459 | 459 | |
460 | - pr_debug("%s: rd %02x%02x%02x calc %02x%02x%02x diff %02x%02x%02x\n", | |
461 | - __func__, | |
462 | - read_ecc[0], read_ecc[1], read_ecc[2], | |
463 | - calc_ecc[0], calc_ecc[1], calc_ecc[2], | |
460 | + pr_debug("%s: rd %*phN calc %*phN diff %02x%02x%02x\n", | |
461 | + __func__, 3, read_ecc, 3, calc_ecc, | |
464 | 462 | diff0, diff1, diff2); |
465 | 463 | |
466 | 464 | if (diff0 == 0 && diff1 == 0 && diff2 == 0) |
... | ... | @@ -562,8 +560,7 @@ |
562 | 560 | ecc_code[1] = readb(info->regs + S3C2410_NFECC + 1); |
563 | 561 | ecc_code[2] = readb(info->regs + S3C2410_NFECC + 2); |
564 | 562 | |
565 | - pr_debug("%s: returning ecc %02x%02x%02x\n", __func__, | |
566 | - ecc_code[0], ecc_code[1], ecc_code[2]); | |
563 | + pr_debug("%s: returning ecc %*phN\n", __func__, 3, ecc_code); | |
567 | 564 | |
568 | 565 | return 0; |
569 | 566 | } |
... | ... | @@ -578,8 +575,7 @@ |
578 | 575 | ecc_code[1] = ecc >> 8; |
579 | 576 | ecc_code[2] = ecc >> 16; |
580 | 577 | |
581 | - pr_debug("calculate_ecc: returning ecc %02x,%02x,%02x\n", | |
582 | - ecc_code[0], ecc_code[1], ecc_code[2]); | |
578 | + pr_debug("%s: returning ecc %*phN\n", __func__, 3, ecc_code); | |
583 | 579 | |
584 | 580 | return 0; |
585 | 581 | } |