mtd_tests cleanup
cover mtd_tests cleanup
This patch series removes the usage of PRINT_PREF and printk's and replaces it with pr_{info,err,crit} whichever is applicable.
Cc Brian Norris <[email protected]>
Cc Artem Bityutskiy <[email protected]>
Brian Norris (1):
mtd: mtd_oobtest: printk -> pr_{info,err,crit}
Vikram Narayanan (8):
mtd_tests/mtd_nandbiterrs: Replace msg macro with pr_{info,err} mtd_tests/mtd_nandecctest: Use pr_fmt macro mtd_tests/mtd_pagetest: Replace printk with pr_{info,crit,err} mtd_tests/mtd_readtest: Replace printk with pr_{info,err} mtd_tests/mtd_speedtest: Replace printk with pr_{info,crit,err} mtd_tests/mtd_stresstest: Replace printk with pr_{info,crit,err} mtd_tests/mtd_subpagetest: Replace printk with pr_{info,crit,err} mtd_tests/mtd_torturetest: Replace printk with pr_{info,crit}
drivers/mtd/tests/mtd_nandbiterrs.c | 73 ++++++++-------- drivers/mtd/tests/mtd_nandecctest.c | 6 +- drivers/mtd/tests/mtd_oobtest.c | 171 +++++++++++++++++------------------ drivers/mtd/tests/mtd_pagetest.c | 152 ++++++++++++++++---------------- drivers/mtd/tests/mtd_readtest.c | 42 +++++----- drivers/mtd/tests/mtd_speedtest.c | 88 +++++++++--------- drivers/mtd/tests/mtd_stresstest.c | 44 +++++----- drivers/mtd/tests/mtd_subpagetest.c | 124 +++++++++++++------------- drivers/mtd/tests/mtd_torturetest.c | 73 ++++++++-------- 9 files changed, 387 insertions(+), 386 deletions(-)
Signature · 1 line
1.7.4.1
PATCH RESEND 1/9 mtd_tests/mtd_nandbiterrs: Replace msg macro with pr_{info,err}
Use pr_fmt instead of msg macro
Signed-off-by Vikram Narayanan <[email protected]>
--- drivers/mtd/tests/mtd_nandbiterrs.c | 73 ++++++++++++++++++----------------- 1 files changed, 37 insertions(+), 36 deletions(-)
drivers/mtd/tests/mtd_nandbiterrs.c +37 -36
@@ -39,6 +39,9 @@* this program; see the file COPYING. If not, write to the Free Software * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/init.h> #include <linux/module.h> #include <linux/moduleparam.h>
@@ -47,8 +50,6 @@#include <linux/mtd/nand.h> #include <linux/slab.h> -#define msg(FMT, VA...) pr_info("mtd_nandbiterrs: "FMT, ##VA) -static int dev;module_param (dev, int,S_IRUGO );MODULE_PARM_DESC (dev,"MTD device number to use" );
@@ -103,7 +104,7 @@ static int erase_block(void)struct erase_info ei;loff_t addr = eraseblock * mtd->erasesize; -msg ("erase_block\n" ); +pr_info ("erase_block\n" );memset (&ei,0 ,sizeof (struct erase_info )); ei.mtd = mtd;
@@ -112,7 +113,7 @@ static int erase_block(void) err =mtd_erase (mtd, &ei);if (err || ei.state ==MTD_ERASE_FAILED ) { -msg ("error %d while erasing\n" , err); +pr_err ("error %d while erasing\n" , err);if (!err) err = -EIO ;return err;
@@ -128,11 +129,11 @@ static int write_page(int log)size_t written;if (log) -msg ("write_page\n" ); +pr_info ("write_page\n" ); err =mtd_write (mtd, offset, mtd->writesize, &written, wbuffer);if (err || written != mtd->writesize) { -msg ("error: write failed at %#llx\n" , (long long )offset); +pr_err ("error: write failed at %#llx\n" , (long long )offset);if (!err) err = -EIO ; }
@@ -147,7 +148,7 @@ static int rewrite_page(int log)struct mtd_oob_ops ops;if (log) -msg ("rewrite page\n" ); +pr_info ("rewrite page\n" ); ops.mode =MTD_OPS_RAW ;/* No ECC */ ops.len = mtd->writesize;
@@ -160,7 +161,7 @@ static int rewrite_page(int log) err =mtd_write_oob (mtd, offset, &ops);if (err || ops.retlen != mtd->writesize) { -msg ("error: write_oob failed (%d)\n" , err); +pr_err ("error: write_oob failed (%d)\n" , err);if (!err) err = -EIO ; }
@@ -177,7 +178,7 @@ static int read_page(int log)struct mtd_ecc_stats oldstats;if (log) -msg ("read_page\n" ); +pr_info ("read_page\n" );/* Saving last mtd stats */ memcpy (&oldstats, &mtd->ecc_stats,sizeof (oldstats));
@@ -187,7 +188,7 @@ static int read_page(int log) err = mtd->ecc_stats.corrected - oldstats.corrected;if (err <0 || read != mtd->writesize) { -msg ("error: read failed at %#llx\n" , (long long )offset); +pr_err ("error: read failed at %#llx\n" , (long long )offset);if (err >=0 ) err = -EIO ; }
@@ -201,11 +202,11 @@ static int verify_page(int log)unsigned i, errs =0 ;if (log) -msg ("verify_page\n" ); +pr_info ("verify_page\n" );for (i =0 ; i < mtd->writesize; i++) {if (rbuffer[i] !=hash (i+seed)) { -msg ("Error: page offset %u, expected %02x, got %02x\n" , +pr_err ("Error: page offset %u, expected %02x, got %02x\n" , i,hash (i+seed), rbuffer[i]); errs++; }
@@ -230,13 +231,13 @@ static int insert_biterror(unsigned byte)for (bit =7 ; bit >=0 ; bit--) {if (CBIT (wbuffer[byte], bit)) {BCLR (wbuffer[byte], bit); -msg ("Inserted biterror @ %u/%u\n" , byte, bit); +pr_info ("Inserted biterror @ %u/%u\n" , byte, bit);return 0 ; } } byte++; } -msg ("biterror: Failed to find a '1' bit\n" ); +pr_err ("biterror: Failed to find a '1' bit\n" );return -EIO ; }
@@ -248,7 +249,7 @@ static int incremental_errors_test(void)unsigned i;unsigned errs_per_subpage =0 ; -msg ("incremental biterrors test\n" ); +pr_info ("incremental biterrors test\n" );for (i =0 ; i < mtd->writesize; i++) wbuffer[i] =hash (i+seed);
@@ -265,9 +266,9 @@ static int incremental_errors_test(void) err =read_page (1 );if (err >0 ) -msg ("Read reported %d corrected bit errors\n" , err); +pr_info ("Read reported %d corrected bit errors\n" , err);if (err <0 ) { -msg ("After %d biterrors per subpage, read reported error %d\n" , +pr_err ("After %d biterrors per subpage, read reported error %d\n" , errs_per_subpage, err); err =0 ; goto exit;
@@ -275,11 +276,11 @@ static int incremental_errors_test(void) err =verify_page (1 );if (err) { -msg ("ECC failure, read data is incorrect despite read success\n" ); +pr_err ("ECC failure, read data is incorrect despite read success\n" ); goto exit; } -msg ("Successfully corrected %d bit errors per subpage\n" , +pr_info ("Successfully corrected %d bit errors per subpage\n" , errs_per_subpage);for (i =0 ; i < subcount; i++) {
@@ -311,7 +312,7 @@ static int overwrite_test(void)memset (bitstats,0 ,sizeof (bitstats)); -msg ("overwrite biterrors test\n" ); +pr_info ("overwrite biterrors test\n" );for (i =0 ; i < mtd->writesize; i++) wbuffer[i] =hash (i+seed);
@@ -329,18 +330,18 @@ static int overwrite_test(void) err =read_page (0 );if (err >=0 ) {if (err >=MAXBITS ) { -msg ("Implausible number of bit errors corrected\n" ); +pr_info ("Implausible number of bit errors corrected\n" ); err = -EIO ;break ; } bitstats[err]++;if (err > max_corrected) { max_corrected = err; -msg ("Read reported %d corrected bit errors\n" , +pr_info ("Read reported %d corrected bit errors\n" , err); } }else {/* err < 0 */ -msg ("Read reported error %d\n" , err); +pr_info ("Read reported error %d\n" , err); err =0 ;break ; }
@@ -348,7 +349,7 @@ static int overwrite_test(void) err =verify_page (0 );if (err) { bitstats[max_corrected] = opno; -msg ("ECC failure, read data is incorrect despite read success\n" ); +pr_info ("ECC failure, read data is incorrect despite read success\n" );break ; }
@@ -357,9 +358,9 @@ static int overwrite_test(void)/* At this point bitstats[0] contains the number of ops with no bit * errors, bitstats[1] the number of ops with 1 bit error, etc. */ -msg ("Bit error histogram (%d operations total):\n" , opno); +pr_info ("Bit error histogram (%d operations total):\n" , opno);for (i =0 ; i < max_corrected; i++) -msg ("Page reads with %3d corrected bit errors: %d\n" , +pr_info ("Page reads with %3d corrected bit errors: %d\n" , i, bitstats[i]); exit:
@@ -370,36 +371,36 @@ static int __init mtd_nandbiterrs_init(void) {int err =0 ; -msg ("\n" ); -msg ("==================================================\n" ); -msg ("MTD device: %d\n" , dev); +printk ("\n" ); +printk (KERN_INFO "==================================================\n" ); +pr_info ("MTD device: %d\n" , dev); mtd =get_mtd_device (NULL , dev);if (IS_ERR (mtd)) { err =PTR_ERR (mtd); -msg ("error: cannot get MTD device\n" ); +pr_err ("error: cannot get MTD device\n" ); goto exit_mtddev; }if (mtd->type !=MTD_NANDFLASH ) { -msg ("this test requires NAND flash\n" ); +pr_info ("this test requires NAND flash\n" ); err = -ENODEV ; goto exit_nand; } -msg ("MTD device size %llu, eraseblock=%u, page=%u, oob=%u\n" , +pr_info ("MTD device size %llu, eraseblock=%u, page=%u, oob=%u\n" , (unsigned long long )mtd->size, mtd->erasesize, mtd->writesize, mtd->oobsize); subsize = mtd->writesize >> mtd->subpage_sft; subcount = mtd->writesize / subsize; -msg ("Device uses %d subpages of %d bytes\n" , subcount, subsize); +pr_info ("Device uses %d subpages of %d bytes\n" , subcount, subsize); offset = page_offset * mtd->writesize; eraseblock =mtd_div_by_eb (offset, mtd); -msg ("Using page=%u, offset=%llu, eraseblock=%u\n" , +pr_info ("Using page=%u, offset=%llu, eraseblock=%u\n" , page_offset, offset, eraseblock); wbuffer =kmalloc (mtd->writesize,GFP_KERNEL );
@@ -432,8 +433,8 @@ static int __init mtd_nandbiterrs_init(void) goto exit_error; err = -EIO ; -msg ("finished successfully.\n" ); -msg ("==================================================\n" ); +pr_info ("finished successfully.\n" ); +printk (KERN_INFO "==================================================\n" ); exit_error:kfree (rbuffer);
Signature · 1 line
1.7.4.1
PATCH RESEND 2/9 mtd_tests/mtd_nandecctest: Use pr_fmt macro
In reply to Vikram NarayananUse KBUILD_MODNAME instead of hardcoding the filename
Signed-off-by Vikram Narayanan <[email protected]>
--- drivers/mtd/tests/mtd_nandecctest.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-)
drivers/mtd/tests/mtd_nandecctest.c +4 -2
@@ -1,3 +1,5 @@ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/kernel.h> #include <linux/module.h> #include <linux/list.h>
@@ -264,13 +266,13 @@ static int nand_ecc_test_run(const size_t size) correct_data, size);if (err) { -pr_err ("mtd_nandecctest: not ok - %s-%zd\n" , +pr_err ("not ok - %s-%zd\n" , nand_ecc_test[i].name, size);dump_data_ecc (error_data, error_ecc, correct_data, correct_ecc, size);break ; } -pr_info ("mtd_nandecctest: ok - %s-%zd\n" , +pr_info ("ok - %s-%zd\n" , nand_ecc_test[i].name, size); } error:
Signature · 1 line
1.7.4.1
PATCH RESEND 3/9 mtd_tests/mtd_pagetest: Replace printk with pr_{info, crit, err}
In reply to Vikram NarayananUse pr_fmt instead of PRINT_PREF macro
Signed-off-by Vikram Narayanan <[email protected]>
--- drivers/mtd/tests/mtd_pagetest.c | 152 +++++++++++++++++++------------------- 1 files changed, 76 insertions(+), 76 deletions(-)
drivers/mtd/tests/mtd_pagetest.c +76 -76
@@ -19,6 +19,8 @@* Author: Adrian Hunter <[email protected]> */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <asm/div64.h> #include <linux/init.h> #include <linux/module.h>
@@ -28,8 +30,6 @@#include <linux/slab.h> #include <linux/sched.h> -#define PRINT_PREF KERN_INFO "mtd_pagetest: " -static int dev = -EINVAL ;module_param (dev, int,S_IRUGO );MODULE_PARM_DESC (dev,"MTD device number to use" );
@@ -79,12 +79,12 @@ static int erase_eraseblock(int ebnum) err =mtd_erase (mtd, &ei);if (err) { -printk (PRINT_PREF "error %d while erasing EB %d\n" , err, ebnum); +pr_err ("error %d while erasing EB %d\n" , err, ebnum);return err; }if (ei.state ==MTD_ERASE_FAILED ) { -printk (PRINT_PREF "some erase error occurred at EB %d\n" , +pr_err ("some erase error occurred at EB %d\n" , ebnum);return -EIO ; }
@@ -102,7 +102,7 @@ static int write_eraseblock(int ebnum)cond_resched (); err =mtd_write (mtd, addr, mtd->erasesize, &written, writebuf);if (err || written != mtd->erasesize) -printk (PRINT_PREF "error: write failed at %#llx\n" , +pr_err ("error: write failed at %#llx\n" , (long long )addr);return err;
@@ -131,7 +131,7 @@ static int verify_eraseblock(int ebnum)if (mtd_is_bitflip (err)) err =0 ;if (err || read != bufsize) { -printk (PRINT_PREF "error: read failed at %#llx\n" , +pr_err ("error: read failed at %#llx\n" , (long long )addr0);return err; }
@@ -139,7 +139,7 @@ static int verify_eraseblock(int ebnum)if (mtd_is_bitflip (err)) err =0 ;if (err || read != bufsize) { -printk (PRINT_PREF "error: read failed at %#llx\n" , +pr_err ("error: read failed at %#llx\n" , (long long )(addrn - bufsize));return err; }
@@ -148,12 +148,12 @@ static int verify_eraseblock(int ebnum)if (mtd_is_bitflip (err)) err =0 ;if (err || read != bufsize) { -printk (PRINT_PREF "error: read failed at %#llx\n" , +pr_err ("error: read failed at %#llx\n" , (long long )addr);break ; }if (memcmp (twopages, writebuf + (j * pgsize), bufsize)) { -printk (PRINT_PREF "error: verify failed at %#llx\n" , +pr_err ("error: verify failed at %#llx\n" , (long long )addr); errcnt +=1 ; }
@@ -166,7 +166,7 @@ static int verify_eraseblock(int ebnum)if (mtd_is_bitflip (err)) err =0 ;if (err || read != bufsize) { -printk (PRINT_PREF "error: read failed at %#llx\n" , +pr_err ("error: read failed at %#llx\n" , (long long )addr0);return err; }
@@ -174,7 +174,7 @@ static int verify_eraseblock(int ebnum)if (mtd_is_bitflip (err)) err =0 ;if (err || read != bufsize) { -printk (PRINT_PREF "error: read failed at %#llx\n" , +pr_err ("error: read failed at %#llx\n" , (long long )(addrn - bufsize));return err; }
@@ -183,14 +183,14 @@ static int verify_eraseblock(int ebnum)if (mtd_is_bitflip (err)) err =0 ;if (err || read != bufsize) { -printk (PRINT_PREF "error: read failed at %#llx\n" , +pr_err ("error: read failed at %#llx\n" , (long long )addr);return err; }memcpy (boundary, writebuf + mtd->erasesize - pgsize, pgsize);set_random_data (boundary + pgsize, pgsize);if (memcmp (twopages, boundary, bufsize)) { -printk (PRINT_PREF "error: verify failed at %#llx\n" , +pr_err ("error: verify failed at %#llx\n" , (long long )addr); errcnt +=1 ; }
@@ -206,10 +206,10 @@ static int crosstest(void)loff_t addr, addr0, addrn;unsigned char *pp1, *pp2, *pp3, *pp4; -printk (PRINT_PREF "crosstest\n" ); +pr_info ("crosstest\n" ); pp1 =kmalloc (pgsize *4 ,GFP_KERNEL );if (!pp1) { -printk (PRINT_PREF "error: cannot allocate memory\n" ); +pr_err ("error: cannot allocate memory\n" );return -ENOMEM ; } pp2 = pp1 + pgsize;
@@ -231,7 +231,7 @@ static int crosstest(void)if (mtd_is_bitflip (err)) err =0 ;if (err || read != pgsize) { -printk (PRINT_PREF "error: read failed at %#llx\n" , +pr_err ("error: read failed at %#llx\n" , (long long )addr);kfree (pp1);return err;
@@ -243,7 +243,7 @@ static int crosstest(void)if (mtd_is_bitflip (err)) err =0 ;if (err || read != pgsize) { -printk (PRINT_PREF "error: read failed at %#llx\n" , +pr_err ("error: read failed at %#llx\n" , (long long )addr);kfree (pp1);return err;
@@ -251,12 +251,12 @@ static int crosstest(void)/* Read first page to pp2 */ addr = addr0; -printk (PRINT_PREF "reading page at %#llx\n" , (long long )addr); +pr_info ("reading page at %#llx\n" , (long long )addr); err =mtd_read (mtd, addr, pgsize, &read, pp2);if (mtd_is_bitflip (err)) err =0 ;if (err || read != pgsize) { -printk (PRINT_PREF "error: read failed at %#llx\n" , +pr_err ("error: read failed at %#llx\n" , (long long )addr);kfree (pp1);return err;
@@ -264,12 +264,12 @@ static int crosstest(void)/* Read last page to pp3 */ addr = addrn - pgsize; -printk (PRINT_PREF "reading page at %#llx\n" , (long long )addr); +pr_info ("reading page at %#llx\n" , (long long )addr); err =mtd_read (mtd, addr, pgsize, &read, pp3);if (mtd_is_bitflip (err)) err =0 ;if (err || read != pgsize) { -printk (PRINT_PREF "error: read failed at %#llx\n" , +pr_err ("error: read failed at %#llx\n" , (long long )addr);kfree (pp1);return err;
@@ -277,25 +277,25 @@ static int crosstest(void)/* Read first page again to pp4 */ addr = addr0; -printk (PRINT_PREF "reading page at %#llx\n" , (long long )addr); +pr_info ("reading page at %#llx\n" , (long long )addr); err =mtd_read (mtd, addr, pgsize, &read, pp4);if (mtd_is_bitflip (err)) err =0 ;if (err || read != pgsize) { -printk (PRINT_PREF "error: read failed at %#llx\n" , +pr_err ("error: read failed at %#llx\n" , (long long )addr);kfree (pp1);return err; }/* pp2 and pp4 should be the same */ -printk (PRINT_PREF "verifying pages read at %#llx match\n" , +pr_info ("verifying pages read at %#llx match\n" , (long long )addr0);if (memcmp (pp2, pp4, pgsize)) { -printk (PRINT_PREF "verify failed!\n" ); +pr_err ("verify failed!\n" ); errcnt +=1 ; }else if (!err) -printk (PRINT_PREF "crosstest ok\n" ); +pr_info ("crosstest ok\n" );kfree (pp1);return err; }
@@ -307,7 +307,7 @@ static int erasecrosstest(void)loff_t addr0;char *readbuf = twopages; -printk (PRINT_PREF "erasecrosstest\n" ); +pr_info ("erasecrosstest\n" ); ebnum =0 ; addr0 =0 ;
@@ -320,79 +320,79 @@ static int erasecrosstest(void)while (ebnum2 && bbt[ebnum2]) ebnum2 -=1 ; -printk (PRINT_PREF "erasing block %d\n" , ebnum); +pr_info ("erasing block %d\n" , ebnum); err =erase_eraseblock (ebnum);if (err)return err; -printk (PRINT_PREF "writing 1st page of block %d\n" , ebnum); +pr_info ("writing 1st page of block %d\n" , ebnum);set_random_data (writebuf, pgsize);strcpy (writebuf,"There is no data like this!" ); err =mtd_write (mtd, addr0, pgsize, &written, writebuf);if (err || written != pgsize) { -printk (PRINT_PREF "error: write failed at %#llx\n" , +pr_info ("error: write failed at %#llx\n" , (long long )addr0);return err ? err :-1 ; } -printk (PRINT_PREF "reading 1st page of block %d\n" , ebnum); +pr_info ("reading 1st page of block %d\n" , ebnum);memset (readbuf,0 , pgsize); err =mtd_read (mtd, addr0, pgsize, &read, readbuf);if (mtd_is_bitflip (err)) err =0 ;if (err || read != pgsize) { -printk (PRINT_PREF "error: read failed at %#llx\n" , +pr_err ("error: read failed at %#llx\n" , (long long )addr0);return err ? err :-1 ; } -printk (PRINT_PREF "verifying 1st page of block %d\n" , ebnum); +pr_info ("verifying 1st page of block %d\n" , ebnum);if (memcmp (writebuf, readbuf, pgsize)) { -printk (PRINT_PREF "verify failed!\n" ); +pr_err ("verify failed!\n" ); errcnt +=1 ;return -1 ; } -printk (PRINT_PREF "erasing block %d\n" , ebnum); +pr_info ("erasing block %d\n" , ebnum); err =erase_eraseblock (ebnum);if (err)return err; -printk (PRINT_PREF "writing 1st page of block %d\n" , ebnum); +pr_info ("writing 1st page of block %d\n" , ebnum);set_random_data (writebuf, pgsize);strcpy (writebuf,"There is no data like this!" ); err =mtd_write (mtd, addr0, pgsize, &written, writebuf);if (err || written != pgsize) { -printk (PRINT_PREF "error: write failed at %#llx\n" , +pr_err ("error: write failed at %#llx\n" , (long long )addr0);return err ? err :-1 ; } -printk (PRINT_PREF "erasing block %d\n" , ebnum2); +pr_info ("erasing block %d\n" , ebnum2); err =erase_eraseblock (ebnum2);if (err)return err; -printk (PRINT_PREF "reading 1st page of block %d\n" , ebnum); +pr_info ("reading 1st page of block %d\n" , ebnum);memset (readbuf,0 , pgsize); err =mtd_read (mtd, addr0, pgsize, &read, readbuf);if (mtd_is_bitflip (err)) err =0 ;if (err || read != pgsize) { -printk (PRINT_PREF "error: read failed at %#llx\n" , +pr_err ("error: read failed at %#llx\n" , (long long )addr0);return err ? err :-1 ; } -printk (PRINT_PREF "verifying 1st page of block %d\n" , ebnum); +pr_info ("verifying 1st page of block %d\n" , ebnum);if (memcmp (writebuf, readbuf, pgsize)) { -printk (PRINT_PREF "verify failed!\n" ); +pr_err ("verify failed!\n" ); errcnt +=1 ;return -1 ; }if (!err) -printk (PRINT_PREF "erasecrosstest ok\n" ); +pr_info ("erasecrosstest ok\n" );return err; }
@@ -402,7 +402,7 @@ static int erasetest(void)int err =0 , i, ebnum, ok =1 ;loff_t addr0; -printk (PRINT_PREF "erasetest\n" ); +pr_info ("erasetest\n" ); ebnum =0 ; addr0 =0 ;
@@ -411,40 +411,40 @@ static int erasetest(void) ebnum +=1 ; } -printk (PRINT_PREF "erasing block %d\n" , ebnum); +pr_info ("erasing block %d\n" , ebnum); err =erase_eraseblock (ebnum);if (err)return err; -printk (PRINT_PREF "writing 1st page of block %d\n" , ebnum); +pr_info ("writing 1st page of block %d\n" , ebnum);set_random_data (writebuf, pgsize); err =mtd_write (mtd, addr0, pgsize, &written, writebuf);if (err || written != pgsize) { -printk (PRINT_PREF "error: write failed at %#llx\n" , +pr_err ("error: write failed at %#llx\n" , (long long )addr0);return err ? err :-1 ; } -printk (PRINT_PREF "erasing block %d\n" , ebnum); +pr_info ("erasing block %d\n" , ebnum); err =erase_eraseblock (ebnum);if (err)return err; -printk (PRINT_PREF "reading 1st page of block %d\n" , ebnum); +pr_info ("reading 1st page of block %d\n" , ebnum); err =mtd_read (mtd, addr0, pgsize, &read, twopages);if (mtd_is_bitflip (err)) err =0 ;if (err || read != pgsize) { -printk (PRINT_PREF "error: read failed at %#llx\n" , +pr_err ("error: read failed at %#llx\n" , (long long )addr0);return err ? err :-1 ; } -printk (PRINT_PREF "verifying 1st page of block %d is all 0xff\n" , +pr_info ("verifying 1st page of block %d is all 0xff\n" , ebnum);for (i =0 ; i < pgsize; ++i)if (twopages[i] !=0xff ) { -printk (PRINT_PREF "verifying all 0xff failed at %d\n" , +pr_err ("verifying all 0xff failed at %d\n" , i); errcnt +=1 ; ok =0 ;
@@ -452,7 +452,7 @@ static int erasetest(void) }if (ok && !err) -printk (PRINT_PREF "erasetest ok\n" ); +pr_info ("erasetest ok\n" );return err; }
@@ -464,7 +464,7 @@ static int is_block_bad(int ebnum) ret =mtd_block_isbad (mtd, addr);if (ret) -printk (PRINT_PREF "block %d is bad\n" , ebnum); +pr_info ("block %d is bad\n" , ebnum);return ret; }
@@ -474,18 +474,18 @@ static int scan_for_bad_eraseblocks(void) bbt =kzalloc (ebcnt,GFP_KERNEL );if (!bbt) { -printk (PRINT_PREF "error: cannot allocate memory\n" ); +pr_err ("error: cannot allocate memory\n" );return -ENOMEM ; } -printk (PRINT_PREF "scanning for bad eraseblocks\n" ); +pr_info ("scanning for bad eraseblocks\n" );for (i =0 ; i < ebcnt; ++i) { bbt[i] =is_block_bad (i) ?1 :0 ;if (bbt[i]) bad +=1 ;cond_resched (); } -printk (PRINT_PREF "scanned %d eraseblocks, %d are bad\n" , i, bad); +pr_info ("scanned %d eraseblocks, %d are bad\n" , i, bad);return 0 ; }
@@ -499,22 +499,22 @@ static int __init mtd_pagetest_init(void)printk (KERN_INFO "=================================================\n" );if (dev <0 ) { -printk (PRINT_PREF "Please specify a valid mtd-device via module paramter\n" ); -printk (KERN_CRIT "CAREFUL: This test wipes all data on the specified MTD device!\n" ); +pr_info ("Please specify a valid mtd-device via module paramter\n" ); +pr_crit ("CAREFUL: This test wipes all data on the specified MTD device!\n" );return -EINVAL ; } -printk (PRINT_PREF "MTD device: %d\n" , dev); +pr_info ("MTD device: %d\n" , dev); mtd =get_mtd_device (NULL , dev);if (IS_ERR (mtd)) { err =PTR_ERR (mtd); -printk (PRINT_PREF "error: cannot get MTD device\n" ); +pr_err ("error: cannot get MTD device\n" );return err; }if (mtd->type !=MTD_NANDFLASH ) { -printk (PRINT_PREF "this test requires NAND flash\n" ); +pr_info ("this test requires NAND flash\n" ); goto out; }
@@ -524,7 +524,7 @@ static int __init mtd_pagetest_init(void) pgcnt = mtd->erasesize / mtd->writesize; pgsize = mtd->writesize; - printk(PRINT_PREF "MTD device size %llu, eraseblock size %u, " + pr_info("MTD device size %llu, eraseblock size %u, " "page size %u, count of eraseblocks %u, pages per " "eraseblock %u, OOB size %u\n", (unsigned long long)mtd->size, mtd->erasesize,
@@ -534,17 +534,17 @@ static int __init mtd_pagetest_init(void) bufsize = pgsize *2 ; writebuf =kmalloc (mtd->erasesize,GFP_KERNEL );if (!writebuf) { -printk (PRINT_PREF "error: cannot allocate memory\n" ); +pr_err ("error: cannot allocate memory\n" ); goto out; } twopages =kmalloc (bufsize,GFP_KERNEL );if (!twopages) { -printk (PRINT_PREF "error: cannot allocate memory\n" ); +pr_err ("error: cannot allocate memory\n" ); goto out; } boundary =kmalloc (bufsize,GFP_KERNEL );if (!boundary) { -printk (PRINT_PREF "error: cannot allocate memory\n" ); +pr_err ("error: cannot allocate memory\n" ); goto out; }
@@ -553,7 +553,7 @@ static int __init mtd_pagetest_init(void) goto out;/* Erase all eraseblocks */ -printk (PRINT_PREF "erasing whole device\n" ); +pr_info ("erasing whole device\n" );for (i =0 ; i < ebcnt; ++i) {if (bbt[i])continue ;
@@ -562,11 +562,11 @@ static int __init mtd_pagetest_init(void) goto out;cond_resched (); } -printk (PRINT_PREF "erased %u eraseblocks\n" , i); +pr_info ("erased %u eraseblocks\n" , i);/* Write all eraseblocks */ simple_srand (1 ); -printk (PRINT_PREF "writing whole device\n" ); +pr_info ("writing whole device\n" );for (i =0 ; i < ebcnt; ++i) {if (bbt[i])continue ;
@@ -574,14 +574,14 @@ static int __init mtd_pagetest_init(void)if (err) goto out;if (i %256 ==0 ) -printk (PRINT_PREF "written up to eraseblock %u\n" , i); +pr_info ("written up to eraseblock %u\n" , i);cond_resched (); } -printk (PRINT_PREF "written %u eraseblocks\n" , i); +pr_info ("written %u eraseblocks\n" , i);/* Check all eraseblocks */ simple_srand (1 ); -printk (PRINT_PREF "verifying all eraseblocks\n" ); +pr_info ("verifying all eraseblocks\n" );for (i =0 ; i < ebcnt; ++i) {if (bbt[i])continue ;
@@ -589,10 +589,10 @@ static int __init mtd_pagetest_init(void)if (err) goto out;if (i %256 ==0 ) -printk (PRINT_PREF "verified up to eraseblock %u\n" , i); +pr_info ("verified up to eraseblock %u\n" , i);cond_resched (); } -printk (PRINT_PREF "verified %u eraseblocks\n" , i); +pr_info ("verified %u eraseblocks\n" , i); err =crosstest ();if (err)
@@ -606,7 +606,7 @@ static int __init mtd_pagetest_init(void)if (err) goto out; -printk (PRINT_PREF "finished with %d errors\n" , errcnt); +pr_info ("finished with %d errors\n" , errcnt); out:kfree (bbt);
@@ -615,7 +615,7 @@ out:kfree (writebuf);put_mtd_device (mtd);if (err) -printk (PRINT_PREF "error %d occurred\n" , err); +pr_info ("error %d occurred\n" , err);printk (KERN_INFO "=================================================\n" );return err; }
Signature · 1 line
1.7.4.1
PATCH RESEND 4/9 mtd_tests/mtd_readtest: Replace printk with pr_{info, err}
In reply to Vikram NarayananUse pr_fmt instead of PRINT_PREF macro
Signed-off-by Vikram Narayanan <[email protected]>
--- drivers/mtd/tests/mtd_readtest.c | 42 +++++++++++++++++++------------------- 1 files changed, 21 insertions(+), 21 deletions(-)
drivers/mtd/tests/mtd_readtest.c +21 -21
@@ -19,6 +19,8 @@* Author: Adrian Hunter <[email protected]> */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/init.h> #include <linux/module.h> #include <linux/moduleparam.h>
@@ -27,8 +29,6 @@#include <linux/slab.h> #include <linux/sched.h> -#define PRINT_PREF KERN_INFO "mtd_readtest: " -static int dev = -EINVAL ;module_param (dev, int,S_IRUGO );MODULE_PARM_DESC (dev,"MTD device number to use" );
@@ -56,7 +56,7 @@ static int read_eraseblock_by_page(int ebnum)if (ret == -EUCLEAN ) ret =0 ;if (ret || read != pgsize) { -printk (PRINT_PREF "error: read failed at %#llx\n" , +pr_err ("error: read failed at %#llx\n" , (long long )addr);if (!err) err = ret;
@@ -77,7 +77,7 @@ static int read_eraseblock_by_page(int ebnum) ret =mtd_read_oob (mtd, addr, &ops);if ((ret && !mtd_is_bitflip (ret)) || ops.oobretlen != mtd->oobsize) { -printk (PRINT_PREF "error: read oob failed at " +pr_err ("error: read oob failed at " "%#llx\n" , (long long )addr);if (!err) err = ret;
@@ -99,7 +99,7 @@ static void dump_eraseblock(int ebnum)char line[128 ];int pg, oob; -printk (PRINT_PREF "dumping eraseblock %d\n" , ebnum); +pr_info ("dumping eraseblock %d\n" , ebnum); n = mtd->erasesize;for (i =0 ; i < n;) {char *p = line;
@@ -112,7 +112,7 @@ static void dump_eraseblock(int ebnum) }if (!mtd->oobsize)return ; -printk (PRINT_PREF "dumping oob from eraseblock %d\n" , ebnum); +pr_info ("dumping oob from eraseblock %d\n" , ebnum); n = mtd->oobsize;for (pg =0 , i =0 ; pg < pgcnt; pg++)for (oob =0 ; oob < n;) {
@@ -134,7 +134,7 @@ static int is_block_bad(int ebnum) ret =mtd_block_isbad (mtd, addr);if (ret) -printk (PRINT_PREF "block %d is bad\n" , ebnum); +pr_info ("block %d is bad\n" , ebnum);return ret; }
@@ -144,21 +144,21 @@ static int scan_for_bad_eraseblocks(void) bbt =kzalloc (ebcnt,GFP_KERNEL );if (!bbt) { -printk (PRINT_PREF "error: cannot allocate memory\n" ); +pr_err ("error: cannot allocate memory\n" );return -ENOMEM ; }if (!mtd_can_have_bb (mtd))return 0 ; -printk (PRINT_PREF "scanning for bad eraseblocks\n" ); +pr_info ("scanning for bad eraseblocks\n" );for (i =0 ; i < ebcnt; ++i) { bbt[i] =is_block_bad (i) ?1 :0 ;if (bbt[i]) bad +=1 ;cond_resched (); } -printk (PRINT_PREF "scanned %d eraseblocks, %d are bad\n" , i, bad); +pr_info ("scanned %d eraseblocks, %d are bad\n" , i, bad);return 0 ; }
@@ -171,21 +171,21 @@ static int __init mtd_readtest_init(void)printk (KERN_INFO "=================================================\n" );if (dev <0 ) { -printk (PRINT_PREF "Please specify a valid mtd-device via module paramter\n" ); +pr_info ("Please specify a valid mtd-device via module paramter\n" );return -EINVAL ; } -printk (PRINT_PREF "MTD device: %d\n" , dev); +pr_info ("MTD device: %d\n" , dev); mtd =get_mtd_device (NULL , dev);if (IS_ERR (mtd)) { err =PTR_ERR (mtd); -printk (PRINT_PREF "error: Cannot get MTD device\n" ); +pr_err ("error: Cannot get MTD device\n" );return err; }if (mtd->writesize ==1 ) { -printk (PRINT_PREF "not NAND flash, assume page size is 512 " +pr_info ("not NAND flash, assume page size is 512 " "bytes.\n" ); pgsize =512 ; }else
@@ -196,7 +196,7 @@ static int __init mtd_readtest_init(void) ebcnt = tmp; pgcnt = mtd->erasesize / pgsize; - printk(PRINT_PREF "MTD device size %llu, eraseblock size %u, " + pr_info("MTD device size %llu, eraseblock size %u, " "page size %u, count of eraseblocks %u, pages per " "eraseblock %u, OOB size %u\n", (unsigned long long)mtd->size, mtd->erasesize,
@@ -205,12 +205,12 @@ static int __init mtd_readtest_init(void) err = -ENOMEM ; iobuf =kmalloc (mtd->erasesize,GFP_KERNEL );if (!iobuf) { -printk (PRINT_PREF "error: cannot allocate memory\n" ); +pr_err ("error: cannot allocate memory\n" ); goto out; } iobuf1 =kmalloc (mtd->erasesize,GFP_KERNEL );if (!iobuf1) { -printk (PRINT_PREF "error: cannot allocate memory\n" ); +pr_err ("error: cannot allocate memory\n" ); goto out; }
@@ -219,7 +219,7 @@ static int __init mtd_readtest_init(void) goto out;/* Read all eraseblocks 1 page at a time */ -printk (PRINT_PREF "testing page read\n" ); +pr_info ("testing page read\n" );for (i =0 ; i < ebcnt; ++i) {int ret;
@@ -235,9 +235,9 @@ static int __init mtd_readtest_init(void) }if (err) -printk (PRINT_PREF "finished with errors\n" ); +pr_info ("finished with errors\n" );else -printk (PRINT_PREF "finished\n" ); +pr_info ("finished\n" ); out:
@@ -246,7 +246,7 @@ out:kfree (bbt);put_mtd_device (mtd);if (err) -printk (PRINT_PREF "error %d occurred\n" , err); +pr_info ("error %d occurred\n" , err);printk (KERN_INFO "=================================================\n" );return err; }
Signature · 1 line
1.7.4.1
PATCH RESEND 5/9 mtd_tests/mtd_speedtest: Replace printk with pr_{info, crit, err}
In reply to Vikram NarayananUse pr_fmt instead of PRINT_PREF macro
Signed-off-by Vikram Narayanan <[email protected]>
--- drivers/mtd/tests/mtd_speedtest.c | 88 ++++++++++++++++++------------------ 1 files changed, 44 insertions(+), 44 deletions(-)
drivers/mtd/tests/mtd_speedtest.c +44 -44
@@ -19,6 +19,8 @@* Author: Adrian Hunter <[email protected]> */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/init.h> #include <linux/module.h> #include <linux/moduleparam.h>
@@ -28,8 +30,6 @@#include <linux/sched.h> #include <linux/random.h> -#define PRINT_PREF KERN_INFO "mtd_speedtest: " -static int dev = -EINVAL ;module_param (dev, int,S_IRUGO );MODULE_PARM_DESC (dev,"MTD device number to use" );
@@ -70,12 +70,12 @@ static int erase_eraseblock(int ebnum) err =mtd_erase (mtd, &ei);if (err) { -printk (PRINT_PREF "error %d while erasing EB %d\n" , err, ebnum); +pr_err ("error %d while erasing EB %d\n" , err, ebnum);return err; }if (ei.state ==MTD_ERASE_FAILED ) { -printk (PRINT_PREF "some erase error occurred at EB %d\n" , +pr_err ("some erase error occurred at EB %d\n" , ebnum);return -EIO ; }
@@ -96,13 +96,13 @@ static int multiblock_erase(int ebnum, int blocks) err =mtd_erase (mtd, &ei);if (err) { -printk (PRINT_PREF "error %d while erasing EB %d, blocks %d\n" , +pr_err ("error %d while erasing EB %d, blocks %d\n" , err, ebnum, blocks);return err; }if (ei.state ==MTD_ERASE_FAILED ) { -printk (PRINT_PREF "some erase error occurred at EB %d," +pr_err ("some erase error occurred at EB %d," "blocks %d\n" , ebnum, blocks);return -EIO ; }
@@ -134,7 +134,7 @@ static int write_eraseblock(int ebnum) err =mtd_write (mtd, addr, mtd->erasesize, &written, iobuf);if (err || written != mtd->erasesize) { -printk (PRINT_PREF "error: write failed at %#llx\n" , addr); +pr_err ("error: write failed at %#llx\n" , addr);if (!err) err = -EINVAL ; }
@@ -152,7 +152,7 @@ static int write_eraseblock_by_page(int ebnum)for (i =0 ; i < pgcnt; i++) { err =mtd_write (mtd, addr, pgsize, &written, buf);if (err || written != pgsize) { -printk (PRINT_PREF "error: write failed at %#llx\n" , +pr_err ("error: write failed at %#llx\n" , addr);if (!err) err = -EINVAL ;
@@ -175,7 +175,7 @@ static int write_eraseblock_by_2pages(int ebnum)for (i =0 ; i < n; i++) { err =mtd_write (mtd, addr, sz, &written, buf);if (err || written != sz) { -printk (PRINT_PREF "error: write failed at %#llx\n" , +pr_err ("error: write failed at %#llx\n" , addr);if (!err) err = -EINVAL ;
@@ -187,7 +187,7 @@ static int write_eraseblock_by_2pages(int ebnum)if (pgcnt %2 ) { err =mtd_write (mtd, addr, pgsize, &written, buf);if (err || written != pgsize) { -printk (PRINT_PREF "error: write failed at %#llx\n" , +pr_err ("error: write failed at %#llx\n" , addr);if (!err) err = -EINVAL ;
@@ -208,7 +208,7 @@ static int read_eraseblock(int ebnum)if (mtd_is_bitflip (err)) err =0 ;if (err || read != mtd->erasesize) { -printk (PRINT_PREF "error: read failed at %#llx\n" , addr); +pr_err ("error: read failed at %#llx\n" , addr);if (!err) err = -EINVAL ; }
@@ -229,7 +229,7 @@ static int read_eraseblock_by_page(int ebnum)if (mtd_is_bitflip (err)) err =0 ;if (err || read != pgsize) { -printk (PRINT_PREF "error: read failed at %#llx\n" , +pr_err ("error: read failed at %#llx\n" , addr);if (!err) err = -EINVAL ;
@@ -255,7 +255,7 @@ static int read_eraseblock_by_2pages(int ebnum)if (mtd_is_bitflip (err)) err =0 ;if (err || read != sz) { -printk (PRINT_PREF "error: read failed at %#llx\n" , +pr_err ("error: read failed at %#llx\n" , addr);if (!err) err = -EINVAL ;
@@ -270,7 +270,7 @@ static int read_eraseblock_by_2pages(int ebnum)if (mtd_is_bitflip (err)) err =0 ;if (err || read != pgsize) { -printk (PRINT_PREF "error: read failed at %#llx\n" , +pr_err ("error: read failed at %#llx\n" , addr);if (!err) err = -EINVAL ;
@@ -287,7 +287,7 @@ static int is_block_bad(int ebnum) ret =mtd_block_isbad (mtd, addr);if (ret) -printk (PRINT_PREF "block %d is bad\n" , ebnum); +pr_info ("block %d is bad\n" , ebnum);return ret; }
@@ -321,21 +321,21 @@ static int scan_for_bad_eraseblocks(void) bbt =kzalloc (ebcnt,GFP_KERNEL );if (!bbt) { -printk (PRINT_PREF "error: cannot allocate memory\n" ); +pr_err ("error: cannot allocate memory\n" );return -ENOMEM ; }if (!mtd_can_have_bb (mtd)) goto out; -printk (PRINT_PREF "scanning for bad eraseblocks\n" ); +pr_info ("scanning for bad eraseblocks\n" );for (i =0 ; i < ebcnt; ++i) { bbt[i] =is_block_bad (i) ?1 :0 ;if (bbt[i]) bad +=1 ;cond_resched (); } -printk (PRINT_PREF "scanned %d eraseblocks, %d are bad\n" , i, bad); +pr_info ("scanned %d eraseblocks, %d are bad\n" , i, bad); out: goodebcnt = ebcnt - bad;return 0 ;
@@ -351,25 +351,25 @@ static int __init mtd_speedtest_init(void)printk (KERN_INFO "=================================================\n" );if (dev <0 ) { -printk (PRINT_PREF "Please specify a valid mtd-device via module paramter\n" ); -printk (KERN_CRIT "CAREFUL: This test wipes all data on the specified MTD device!\n" ); +pr_info ("Please specify a valid mtd-device via module paramter\n" ); +pr_crit ("CAREFUL: This test wipes all data on the specified MTD device!\n" );return -EINVAL ; }if (count) -printk (PRINT_PREF "MTD device: %d count: %d\n" , dev, count); +pr_info ("MTD device: %d count: %d\n" , dev, count);else -printk (PRINT_PREF "MTD device: %d\n" , dev); +pr_info ("MTD device: %d\n" , dev); mtd =get_mtd_device (NULL , dev);if (IS_ERR (mtd)) { err =PTR_ERR (mtd); -printk (PRINT_PREF "error: cannot get MTD device\n" ); +pr_err ("error: cannot get MTD device\n" );return err; }if (mtd->writesize ==1 ) { -printk (PRINT_PREF "not NAND flash, assume page size is 512 " +pr_info ("not NAND flash, assume page size is 512 " "bytes.\n" ); pgsize =512 ; }else
@@ -380,7 +380,7 @@ static int __init mtd_speedtest_init(void) ebcnt = tmp; pgcnt = mtd->erasesize / pgsize; - printk(PRINT_PREF "MTD device size %llu, eraseblock size %u, " + pr_info("MTD device size %llu, eraseblock size %u, " "page size %u, count of eraseblocks %u, pages per " "eraseblock %u, OOB size %u\n", (unsigned long long)mtd->size, mtd->erasesize,
@@ -392,7 +392,7 @@ static int __init mtd_speedtest_init(void) err = -ENOMEM ; iobuf =kmalloc (mtd->erasesize,GFP_KERNEL );if (!iobuf) { -printk (PRINT_PREF "error: cannot allocate memory\n" ); +pr_err ("error: cannot allocate memory\n" ); goto out; }
@@ -407,7 +407,7 @@ static int __init mtd_speedtest_init(void) goto out;/* Write all eraseblocks, 1 eraseblock at a time */ -printk (PRINT_PREF "testing eraseblock write speed\n" ); +pr_info ("testing eraseblock write speed\n" );start_timing ();for (i =0 ; i < ebcnt; ++i) {if (bbt[i])
@@ -419,10 +419,10 @@ static int __init mtd_speedtest_init(void) }stop_timing (); speed =calc_speed (); -printk (PRINT_PREF "eraseblock write speed is %ld KiB/s\n" , speed); +pr_info ("eraseblock write speed is %ld KiB/s\n" , speed);/* Read all eraseblocks, 1 eraseblock at a time */ -printk (PRINT_PREF "testing eraseblock read speed\n" ); +pr_info ("testing eraseblock read speed\n" );start_timing ();for (i =0 ; i < ebcnt; ++i) {if (bbt[i])
@@ -434,14 +434,14 @@ static int __init mtd_speedtest_init(void) }stop_timing (); speed =calc_speed (); -printk (PRINT_PREF "eraseblock read speed is %ld KiB/s\n" , speed); +pr_info ("eraseblock read speed is %ld KiB/s\n" , speed); err =erase_whole_device ();if (err) goto out;/* Write all eraseblocks, 1 page at a time */ -printk (PRINT_PREF "testing page write speed\n" ); +pr_info ("testing page write speed\n" );start_timing ();for (i =0 ; i < ebcnt; ++i) {if (bbt[i])
@@ -453,10 +453,10 @@ static int __init mtd_speedtest_init(void) }stop_timing (); speed =calc_speed (); -printk (PRINT_PREF "page write speed is %ld KiB/s\n" , speed); +pr_info ("page write speed is %ld KiB/s\n" , speed);/* Read all eraseblocks, 1 page at a time */ -printk (PRINT_PREF "testing page read speed\n" ); +pr_info ("testing page read speed\n" );start_timing ();for (i =0 ; i < ebcnt; ++i) {if (bbt[i])
@@ -468,14 +468,14 @@ static int __init mtd_speedtest_init(void) }stop_timing (); speed =calc_speed (); -printk (PRINT_PREF "page read speed is %ld KiB/s\n" , speed); +pr_info ("page read speed is %ld KiB/s\n" , speed); err =erase_whole_device ();if (err) goto out;/* Write all eraseblocks, 2 pages at a time */ -printk (PRINT_PREF "testing 2 page write speed\n" ); +pr_info ("testing 2 page write speed\n" );start_timing ();for (i =0 ; i < ebcnt; ++i) {if (bbt[i])
@@ -487,10 +487,10 @@ static int __init mtd_speedtest_init(void) }stop_timing (); speed =calc_speed (); -printk (PRINT_PREF "2 page write speed is %ld KiB/s\n" , speed); +pr_info ("2 page write speed is %ld KiB/s\n" , speed);/* Read all eraseblocks, 2 pages at a time */ -printk (PRINT_PREF "testing 2 page read speed\n" ); +pr_info ("testing 2 page read speed\n" );start_timing ();for (i =0 ; i < ebcnt; ++i) {if (bbt[i])
@@ -502,10 +502,10 @@ static int __init mtd_speedtest_init(void) }stop_timing (); speed =calc_speed (); -printk (PRINT_PREF "2 page read speed is %ld KiB/s\n" , speed); +pr_info ("2 page read speed is %ld KiB/s\n" , speed);/* Erase all eraseblocks */ -printk (PRINT_PREF "Testing erase speed\n" ); +pr_info ("Testing erase speed\n" );start_timing ();for (i =0 ; i < ebcnt; ++i) {if (bbt[i])
@@ -517,12 +517,12 @@ static int __init mtd_speedtest_init(void) }stop_timing (); speed =calc_speed (); -printk (PRINT_PREF "erase speed is %ld KiB/s\n" , speed); +pr_info ("erase speed is %ld KiB/s\n" , speed);/* Multi-block erase all eraseblocks */ for (k =1 ; k <7 ; k++) { blocks =1 << k; -printk (PRINT_PREF "Testing %dx multi-block erase speed\n" , +pr_info ("Testing %dx multi-block erase speed\n" , blocks);start_timing ();for (i =0 ; i < ebcnt; ) {
@@ -541,16 +541,16 @@ static int __init mtd_speedtest_init(void) }stop_timing (); speed =calc_speed (); -printk (PRINT_PREF "%dx multi-block erase speed is %ld KiB/s\n" , +pr_info ("%dx multi-block erase speed is %ld KiB/s\n" , blocks, speed); } -printk (PRINT_PREF "finished\n" ); +pr_info ("finished\n" ); out:kfree (iobuf);kfree (bbt);put_mtd_device (mtd);if (err) -printk (PRINT_PREF "error %d occurred\n" , err); +pr_info ("error %d occurred\n" , err);printk (KERN_INFO "=================================================\n" );return err; }
Signature · 1 line
1.7.4.1
PATCH RESEND 6/9 mtd_tests/mtd_stresstest: Replace printk with pr_{info,crit,err}
In reply to Vikram NarayananUse pr_fmt instead of PRINT_PREF macro
Signed-off-by Vikram Narayanan <[email protected]>
--- drivers/mtd/tests/mtd_stresstest.c | 44 ++++++++++++++++++------------------ 1 files changed, 22 insertions(+), 22 deletions(-)
drivers/mtd/tests/mtd_stresstest.c +22 -22
@@ -19,6 +19,8 @@* Author: Adrian Hunter <[email protected]> */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/init.h> #include <linux/module.h> #include <linux/moduleparam.h>
@@ -29,8 +31,6 @@#include <linux/vmalloc.h> #include <linux/random.h> -#define PRINT_PREF KERN_INFO "mtd_stresstest: " -static int dev = -EINVAL ;module_param (dev, int,S_IRUGO );MODULE_PARM_DESC (dev,"MTD device number to use" );
@@ -94,12 +94,12 @@ static int erase_eraseblock(int ebnum) err =mtd_erase (mtd, &ei);if (unlikely (err)) { -printk (PRINT_PREF "error %d while erasing EB %d\n" , err, ebnum); +pr_err ("error %d while erasing EB %d\n" , err, ebnum);return err; }if (unlikely (ei.state ==MTD_ERASE_FAILED )) { -printk (PRINT_PREF "some erase error occurred at EB %d\n" , +pr_err ("some erase error occurred at EB %d\n" , ebnum);return -EIO ; }
@@ -114,7 +114,7 @@ static int is_block_bad(int ebnum) ret =mtd_block_isbad (mtd, addr);if (ret) -printk (PRINT_PREF "block %d is bad\n" , ebnum); +pr_info ("block %d is bad\n" , ebnum);return ret; }
@@ -137,7 +137,7 @@ static int do_read(void)if (mtd_is_bitflip (err)) err =0 ;if (unlikely (err || read != len)) { -printk (PRINT_PREF "error: read failed at 0x%llx\n" , +pr_err ("error: read failed at 0x%llx\n" , (long long )addr);if (!err) err = -EINVAL ;
@@ -174,7 +174,7 @@ static int do_write(void) addr = eb * mtd->erasesize + offs; err =mtd_write (mtd, addr, len, &written, writebuf);if (unlikely (err || written != len)) { -printk (PRINT_PREF "error: write failed at 0x%llx\n" , +pr_err ("error: write failed at 0x%llx\n" , (long long )addr);if (!err) err = -EINVAL ;
@@ -203,21 +203,21 @@ static int scan_for_bad_eraseblocks(void) bbt =kzalloc (ebcnt,GFP_KERNEL );if (!bbt) { -printk (PRINT_PREF "error: cannot allocate memory\n" ); +pr_err ("error: cannot allocate memory\n" );return -ENOMEM ; }if (!mtd_can_have_bb (mtd))return 0 ; -printk (PRINT_PREF "scanning for bad eraseblocks\n" ); +pr_info ("scanning for bad eraseblocks\n" );for (i =0 ; i < ebcnt; ++i) { bbt[i] =is_block_bad (i) ?1 :0 ;if (bbt[i]) bad +=1 ;cond_resched (); } -printk (PRINT_PREF "scanned %d eraseblocks, %d are bad\n" , i, bad); +pr_info ("scanned %d eraseblocks, %d are bad\n" , i, bad);return 0 ; }
@@ -231,22 +231,22 @@ static int __init mtd_stresstest_init(void)printk (KERN_INFO "=================================================\n" );if (dev <0 ) { -printk (PRINT_PREF "Please specify a valid mtd-device via module paramter\n" ); -printk (KERN_CRIT "CAREFUL: This test wipes all data on the specified MTD device!\n" ); +pr_info ("Please specify a valid mtd-device via module paramter\n" ); +pr_crit ("CAREFUL: This test wipes all data on the specified MTD device!\n" );return -EINVAL ; } -printk (PRINT_PREF "MTD device: %d\n" , dev); +pr_info ("MTD device: %d\n" , dev); mtd =get_mtd_device (NULL , dev);if (IS_ERR (mtd)) { err =PTR_ERR (mtd); -printk (PRINT_PREF "error: cannot get MTD device\n" ); +pr_err ("error: cannot get MTD device\n" );return err; }if (mtd->writesize ==1 ) { -printk (PRINT_PREF "not NAND flash, assume page size is 512 " +pr_info ("not NAND flash, assume page size is 512 " "bytes.\n" ); pgsize =512 ; }else
@@ -257,14 +257,14 @@ static int __init mtd_stresstest_init(void) ebcnt = tmp; pgcnt = mtd->erasesize / pgsize; -printk (PRINT_PREF "MTD device size %llu, eraseblock size %u, " +pr_info ("MTD device size %llu, eraseblock size %u, " "page size %u, count of eraseblocks %u, pages per " "eraseblock %u, OOB size %u\n" , (unsigned long long )mtd->size, mtd->erasesize, pgsize, ebcnt, pgcnt, mtd->oobsize);if (ebcnt <2 ) { -printk (PRINT_PREF "error: need at least 2 eraseblocks\n" ); +pr_err ("error: need at least 2 eraseblocks\n" ); err = -ENOSPC ; goto out_put_mtd; }
@@ -277,7 +277,7 @@ static int __init mtd_stresstest_init(void) writebuf =vmalloc (bufsize); offsets =kmalloc (ebcnt *sizeof (int ),GFP_KERNEL );if (!readbuf || !writebuf || !offsets) { -printk (PRINT_PREF "error: cannot allocate memory\n" ); +pr_err ("error: cannot allocate memory\n" ); goto out; }for (i =0 ; i < ebcnt; i++)
@@ -290,16 +290,16 @@ static int __init mtd_stresstest_init(void) goto out;/* Do operations */ -printk (PRINT_PREF "doing operations\n" ); +pr_info ("doing operations\n" );for (op =0 ; op < count; op++) {if ((op &1023 ) ==0 ) -printk (PRINT_PREF "%d operations done\n" , op); +pr_info ("%d operations done\n" , op); err =do_operation ();if (err) goto out;cond_resched (); } -printk (PRINT_PREF "finished, %d operations done\n" , op); +pr_info ("finished, %d operations done\n" , op); out:kfree (offsets);
@@ -309,7 +309,7 @@ out: out_put_mtd:put_mtd_device (mtd);if (err) -printk (PRINT_PREF "error %d occurred\n" , err); +pr_info ("error %d occurred\n" , err);printk (KERN_INFO "=================================================\n" );return err; }
Signature · 1 line
1.7.4.1
PATCH RESEND 7/9 mtd_tests/mtd_subpagetest: Replace printk with pr_{info,crit,err}
In reply to Vikram NarayananUse pr_fmt instead of PRINT_PREF macro
Signed-off-by Vikram Narayanan <[email protected]>
--- drivers/mtd/tests/mtd_subpagetest.c | 124 +++++++++++++++++----------------- 1 files changed, 62 insertions(+), 62 deletions(-)
drivers/mtd/tests/mtd_subpagetest.c +62 -62
@@ -19,6 +19,8 @@* */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/init.h> #include <linux/module.h> #include <linux/moduleparam.h>
@@ -27,8 +29,6 @@#include <linux/slab.h> #include <linux/sched.h> -#define PRINT_PREF KERN_INFO "mtd_subpagetest: " -static int dev = -EINVAL ;module_param (dev, int,S_IRUGO );MODULE_PARM_DESC (dev,"MTD device number to use" );
@@ -82,12 +82,12 @@ static int erase_eraseblock(int ebnum) err =mtd_erase (mtd, &ei);if (err) { -printk (PRINT_PREF "error %d while erasing EB %d\n" , err, ebnum); +pr_err ("error %d while erasing EB %d\n" , err, ebnum);return err; }if (ei.state ==MTD_ERASE_FAILED ) { -printk (PRINT_PREF "some erase error occurred at EB %d\n" , +pr_err ("some erase error occurred at EB %d\n" , ebnum);return -EIO ; }
@@ -100,7 +100,7 @@ static int erase_whole_device(void)int err;unsigned int i; -printk (PRINT_PREF "erasing whole device\n" ); +pr_info ("erasing whole device\n" );for (i =0 ; i < ebcnt; ++i) {if (bbt[i])continue ;
@@ -109,7 +109,7 @@ static int erase_whole_device(void)return err;cond_resched (); } -printk (PRINT_PREF "erased %u eraseblocks\n" , i); +pr_info ("erased %u eraseblocks\n" , i);return 0 ; }
@@ -122,11 +122,11 @@ static int write_eraseblock(int ebnum)set_random_data (writebuf, subpgsize); err =mtd_write (mtd, addr, subpgsize, &written, writebuf);if (unlikely (err || written != subpgsize)) { -printk (PRINT_PREF "error: write failed at %#llx\n" , +pr_err ("error: write failed at %#llx\n" , (long long )addr);if (written != subpgsize) { -printk (PRINT_PREF " write size: %#x\n" , subpgsize); -printk (PRINT_PREF " written: %#zx\n" , written); +pr_err (" write size: %#x\n" , subpgsize); +pr_err (" written: %#zx\n" , written); }return err ? err :-1 ; }
@@ -136,11 +136,11 @@ static int write_eraseblock(int ebnum)set_random_data (writebuf, subpgsize); err =mtd_write (mtd, addr, subpgsize, &written, writebuf);if (unlikely (err || written != subpgsize)) { -printk (PRINT_PREF "error: write failed at %#llx\n" , +pr_err ("error: write failed at %#llx\n" , (long long )addr);if (written != subpgsize) { -printk (PRINT_PREF " write size: %#x\n" , subpgsize); -printk (PRINT_PREF " written: %#zx\n" , written); +pr_err (" write size: %#x\n" , subpgsize); +pr_err (" written: %#zx\n" , written); }return err ? err :-1 ; }
@@ -160,12 +160,12 @@ static int write_eraseblock2(int ebnum)set_random_data (writebuf, subpgsize * k); err =mtd_write (mtd, addr, subpgsize * k, &written, writebuf);if (unlikely (err || written != subpgsize * k)) { -printk (PRINT_PREF "error: write failed at %#llx\n" , +pr_err ("error: write failed at %#llx\n" , (long long )addr);if (written != subpgsize) { -printk (PRINT_PREF " write size: %#x\n" , +pr_err (" write size: %#x\n" , subpgsize * k); -printk (PRINT_PREF " written: %#08zx\n" , +pr_err (" written: %#08zx\n" , written); }return err ? err :-1 ;
@@ -198,23 +198,23 @@ static int verify_eraseblock(int ebnum) err =mtd_read (mtd, addr, subpgsize, &read, readbuf);if (unlikely (err || read != subpgsize)) {if (mtd_is_bitflip (err) && read == subpgsize) { -printk (PRINT_PREF "ECC correction at %#llx\n" , +pr_info ("ECC correction at %#llx\n" , (long long )addr); err =0 ; }else { -printk (PRINT_PREF "error: read failed at %#llx\n" , +pr_err ("error: read failed at %#llx\n" , (long long )addr);return err ? err :-1 ; } }if (unlikely (memcmp (readbuf, writebuf, subpgsize))) { -printk (PRINT_PREF "error: verify failed at %#llx\n" , +pr_err ("error: verify failed at %#llx\n" , (long long )addr); -printk (PRINT_PREF "------------- written----------------\n" ); +pr_info ("------------- written----------------\n" );print_subpage (writebuf); -printk (PRINT_PREF "------------- read ------------------\n" ); +pr_info ("------------- read ------------------\n" );print_subpage (readbuf); -printk (PRINT_PREF "-------------------------------------\n" ); +pr_info ("-------------------------------------\n" ); errcnt +=1 ; }
@@ -225,23 +225,23 @@ static int verify_eraseblock(int ebnum) err =mtd_read (mtd, addr, subpgsize, &read, readbuf);if (unlikely (err || read != subpgsize)) {if (mtd_is_bitflip (err) && read == subpgsize) { -printk (PRINT_PREF "ECC correction at %#llx\n" , +pr_info ("ECC correction at %#llx\n" , (long long )addr); err =0 ; }else { -printk (PRINT_PREF "error: read failed at %#llx\n" , +pr_err ("error: read failed at %#llx\n" , (long long )addr);return err ? err :-1 ; } }if (unlikely (memcmp (readbuf, writebuf, subpgsize))) { -printk (PRINT_PREF "error: verify failed at %#llx\n" , +pr_info ("error: verify failed at %#llx\n" , (long long )addr); -printk (PRINT_PREF "------------- written----------------\n" ); +pr_info ("------------- written----------------\n" );print_subpage (writebuf); -printk (PRINT_PREF "------------- read ------------------\n" ); +pr_info ("------------- read ------------------\n" );print_subpage (readbuf); -printk (PRINT_PREF "-------------------------------------\n" ); +pr_info ("-------------------------------------\n" ); errcnt +=1 ; }
@@ -262,17 +262,17 @@ static int verify_eraseblock2(int ebnum) err =mtd_read (mtd, addr, subpgsize * k, &read, readbuf);if (unlikely (err || read != subpgsize * k)) {if (mtd_is_bitflip (err) && read == subpgsize * k) { -printk (PRINT_PREF "ECC correction at %#llx\n" , +pr_info ("ECC correction at %#llx\n" , (long long )addr); err =0 ; }else { -printk (PRINT_PREF "error: read failed at " +pr_err ("error: read failed at " "%#llx\n" , (long long )addr);return err ? err :-1 ; } }if (unlikely (memcmp (readbuf, writebuf, subpgsize * k))) { -printk (PRINT_PREF "error: verify failed at %#llx\n" , +pr_err ("error: verify failed at %#llx\n" , (long long )addr); errcnt +=1 ; }
@@ -295,17 +295,17 @@ static int verify_eraseblock_ff(int ebnum) err =mtd_read (mtd, addr, subpgsize, &read, readbuf);if (unlikely (err || read != subpgsize)) {if (mtd_is_bitflip (err) && read == subpgsize) { -printk (PRINT_PREF "ECC correction at %#llx\n" , +pr_info ("ECC correction at %#llx\n" , (long long )addr); err =0 ; }else { -printk (PRINT_PREF "error: read failed at " +pr_err ("error: read failed at " "%#llx\n" , (long long )addr);return err ? err :-1 ; } }if (unlikely (memcmp (readbuf, writebuf, subpgsize))) { -printk (PRINT_PREF "error: verify 0xff failed at " +pr_err ("error: verify 0xff failed at " "%#llx\n" , (long long )addr); errcnt +=1 ; }
@@ -320,7 +320,7 @@ static int verify_all_eraseblocks_ff(void)int err;unsigned int i; -printk (PRINT_PREF "verifying all eraseblocks for 0xff\n" ); +pr_info ("verifying all eraseblocks for 0xff\n" );for (i =0 ; i < ebcnt; ++i) {if (bbt[i])continue ;
@@ -328,10 +328,10 @@ static int verify_all_eraseblocks_ff(void)if (err)return err;if (i %256 ==0 ) -printk (PRINT_PREF "verified up to eraseblock %u\n" , i); +pr_info ("verified up to eraseblock %u\n" , i);cond_resched (); } -printk (PRINT_PREF "verified %u eraseblocks\n" , i); +pr_info ("verified %u eraseblocks\n" , i);return 0 ; }
@@ -342,7 +342,7 @@ static int is_block_bad(int ebnum) ret =mtd_block_isbad (mtd, addr);if (ret) -printk (PRINT_PREF "block %d is bad\n" , ebnum); +pr_info ("block %d is bad\n" , ebnum);return ret; }
@@ -352,18 +352,18 @@ static int scan_for_bad_eraseblocks(void) bbt =kzalloc (ebcnt,GFP_KERNEL );if (!bbt) { -printk (PRINT_PREF "error: cannot allocate memory\n" ); +pr_err ("error: cannot allocate memory\n" );return -ENOMEM ; } -printk (PRINT_PREF "scanning for bad eraseblocks\n" ); +pr_info ("scanning for bad eraseblocks\n" );for (i =0 ; i < ebcnt; ++i) { bbt[i] =is_block_bad (i) ?1 :0 ;if (bbt[i]) bad +=1 ;cond_resched (); } -printk (PRINT_PREF "scanned %d eraseblocks, %d are bad\n" , i, bad); +pr_info ("scanned %d eraseblocks, %d are bad\n" , i, bad);return 0 ; }
@@ -377,22 +377,22 @@ static int __init mtd_subpagetest_init(void)printk (KERN_INFO "=================================================\n" );if (dev <0 ) { -printk (PRINT_PREF "Please specify a valid mtd-device via module paramter\n" ); -printk (KERN_CRIT "CAREFUL: This test wipes all data on the specified MTD device!\n" ); +pr_info ("Please specify a valid mtd-device via module paramter\n" ); +pr_crit ("CAREFUL: This test wipes all data on the specified MTD device!\n" );return -EINVAL ; } -printk (PRINT_PREF "MTD device: %d\n" , dev); +pr_info ("MTD device: %d\n" , dev); mtd =get_mtd_device (NULL , dev);if (IS_ERR (mtd)) { err =PTR_ERR (mtd); -printk (PRINT_PREF "error: cannot get MTD device\n" ); +pr_err ("error: cannot get MTD device\n" );return err; }if (mtd->type !=MTD_NANDFLASH ) { -printk (PRINT_PREF "this test requires NAND flash\n" ); +pr_info ("this test requires NAND flash\n" ); goto out; }
@@ -402,7 +402,7 @@ static int __init mtd_subpagetest_init(void) ebcnt = tmp; pgcnt = mtd->erasesize / mtd->writesize; - printk(PRINT_PREF "MTD device size %llu, eraseblock size %u, " + pr_info("MTD device size %llu, eraseblock size %u, " "page size %u, subpage size %u, count of eraseblocks %u, " "pages per eraseblock %u, OOB size %u\n", (unsigned long long)mtd->size, mtd->erasesize,
@@ -412,12 +412,12 @@ static int __init mtd_subpagetest_init(void) bufsize = subpgsize *32 ; writebuf =kmalloc (bufsize,GFP_KERNEL );if (!writebuf) { -printk (PRINT_PREF "error: cannot allocate memory\n" ); +pr_info ("error: cannot allocate memory\n" ); goto out; } readbuf =kmalloc (bufsize,GFP_KERNEL );if (!readbuf) { -printk (PRINT_PREF "error: cannot allocate memory\n" ); +pr_info ("error: cannot allocate memory\n" ); goto out; }
@@ -429,7 +429,7 @@ static int __init mtd_subpagetest_init(void)if (err) goto out; -printk (PRINT_PREF "writing whole device\n" ); +pr_info ("writing whole device\n" );simple_srand (1 );for (i =0 ; i < ebcnt; ++i) {if (bbt[i])
@@ -438,13 +438,13 @@ static int __init mtd_subpagetest_init(void)if (unlikely (err)) goto out;if (i %256 ==0 ) -printk (PRINT_PREF "written up to eraseblock %u\n" , i); +pr_info ("written up to eraseblock %u\n" , i);cond_resched (); } -printk (PRINT_PREF "written %u eraseblocks\n" , i); +pr_info ("written %u eraseblocks\n" , i);simple_srand (1 ); -printk (PRINT_PREF "verifying all eraseblocks\n" ); +pr_info ("verifying all eraseblocks\n" );for (i =0 ; i < ebcnt; ++i) {if (bbt[i])continue ;
@@ -452,10 +452,10 @@ static int __init mtd_subpagetest_init(void)if (unlikely (err)) goto out;if (i %256 ==0 ) -printk (PRINT_PREF "verified up to eraseblock %u\n" , i); +pr_info ("verified up to eraseblock %u\n" , i);cond_resched (); } -printk (PRINT_PREF "verified %u eraseblocks\n" , i); +pr_info ("verified %u eraseblocks\n" , i); err =erase_whole_device ();if (err)
@@ -467,7 +467,7 @@ static int __init mtd_subpagetest_init(void)/* Write all eraseblocks */ simple_srand (3 ); -printk (PRINT_PREF "writing whole device\n" ); +pr_info ("writing whole device\n" );for (i =0 ; i < ebcnt; ++i) {if (bbt[i])continue ;
@@ -475,14 +475,14 @@ static int __init mtd_subpagetest_init(void)if (unlikely (err)) goto out;if (i %256 ==0 ) -printk (PRINT_PREF "written up to eraseblock %u\n" , i); +pr_info ("written up to eraseblock %u\n" , i);cond_resched (); } -printk (PRINT_PREF "written %u eraseblocks\n" , i); +pr_info ("written %u eraseblocks\n" , i);/* Check all eraseblocks */ simple_srand (3 ); -printk (PRINT_PREF "verifying all eraseblocks\n" ); +pr_info ("verifying all eraseblocks\n" );for (i =0 ; i < ebcnt; ++i) {if (bbt[i])continue ;
@@ -490,10 +490,10 @@ static int __init mtd_subpagetest_init(void)if (unlikely (err)) goto out;if (i %256 ==0 ) -printk (PRINT_PREF "verified up to eraseblock %u\n" , i); +pr_info ("verified up to eraseblock %u\n" , i);cond_resched (); } -printk (PRINT_PREF "verified %u eraseblocks\n" , i); +pr_info ("verified %u eraseblocks\n" , i); err =erase_whole_device ();if (err)
@@ -503,7 +503,7 @@ static int __init mtd_subpagetest_init(void)if (err) goto out; -printk (PRINT_PREF "finished with %d errors\n" , errcnt); +pr_info ("finished with %d errors\n" , errcnt); out:kfree (bbt);
@@ -511,7 +511,7 @@ out:kfree (writebuf);put_mtd_device (mtd);if (err) -printk (PRINT_PREF "error %d occurred\n" , err); +pr_info ("error %d occurred\n" , err);printk (KERN_INFO "=================================================\n" );return err; }
Signature · 1 line
1.7.4.1
PATCH RESEND 8/9 mtd_tests/mtd_torturetest: Replace printk with pr_{info,crit}
In reply to Vikram NarayananUse pr_fmt instead of PRINT_PREF macro
Signed-off-by Vikram Narayanan <[email protected]>
--- drivers/mtd/tests/mtd_torturetest.c | 73 ++++++++++++++++++----------------- 1 files changed, 37 insertions(+), 36 deletions(-)
drivers/mtd/tests/mtd_torturetest.c +37 -36
@@ -23,6 +23,8 @@* damage caused by this program. */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/init.h> #include <linux/module.h> #include <linux/moduleparam.h>
@@ -31,7 +33,6 @@#include <linux/slab.h> #include <linux/sched.h> -#define PRINT_PREF KERN_INFO "mtd_torturetest: "#define RETRIES 3static int eb =8 ;
@@ -107,12 +108,12 @@ static inline int erase_eraseblock(int ebnum) err =mtd_erase (mtd, &ei);if (err) { -printk (PRINT_PREF "error %d while erasing EB %d\n" , err, ebnum); +pr_err ("error %d while erasing EB %d\n" , err, ebnum);return err; }if (ei.state ==MTD_ERASE_FAILED ) { -printk (PRINT_PREF "some erase error occurred at EB %d\n" , +pr_err ("some erase error occurred at EB %d\n" , ebnum);return -EIO ; }
@@ -139,40 +140,40 @@ static inline int check_eraseblock(int ebnum, unsigned char *buf) retry: err =mtd_read (mtd, addr, len, &read, check_buf);if (mtd_is_bitflip (err)) -printk (PRINT_PREF "single bit flip occurred at EB %d " +pr_err ("single bit flip occurred at EB %d " "MTD reported that it was fixed.\n" , ebnum);else if (err) { -printk (PRINT_PREF "error %d while reading EB %d, " +pr_err ("error %d while reading EB %d, " "read %zd\n" , err, ebnum, read);return err; }if (read != len) { -printk (PRINT_PREF "failed to read %zd bytes from EB %d, " +pr_err ("failed to read %zd bytes from EB %d, " "read only %zd, but no error reported\n" , len, ebnum, read);return -EIO ; }if (memcmp (buf, check_buf, len)) { -printk (PRINT_PREF "read wrong data from EB %d\n" , ebnum); +pr_err ("read wrong data from EB %d\n" , ebnum);report_corrupt (check_buf, buf);if (retries++ <RETRIES ) {/* Try read again */ yield (); -printk (PRINT_PREF "re-try reading data from EB %d\n" , +pr_info ("re-try reading data from EB %d\n" , ebnum); goto retry; }else { -printk (PRINT_PREF "retried %d times, still errors, " +pr_info ("retried %d times, still errors, " "give-up\n" ,RETRIES );return -EINVAL ; } }if (retries !=0 ) -printk (PRINT_PREF "only attempt number %d was OK (!!!)\n" , +pr_info ("only attempt number %d was OK (!!!)\n" , retries);return 0 ;
@@ -191,12 +192,12 @@ static inline int write_pattern(int ebnum, void *buf) } err =mtd_write (mtd, addr, len, &written, buf);if (err) { -printk (PRINT_PREF "error %d while writing EB %d, written %zd" +pr_err ("error %d while writing EB %d, written %zd" " bytes\n" , err, ebnum, written);return err; }if (written != len) { -printk (PRINT_PREF "written only %zd bytes of %zd, but no error" +pr_info ("written only %zd bytes of %zd, but no error" " reported\n" , written, len);return -EIO ; }
@@ -211,64 +212,64 @@ static int __init tort_init(void)printk (KERN_INFO "\n" );printk (KERN_INFO "=================================================\n" ); -printk (PRINT_PREF "Warning: this program is trying to wear out your " +pr_info ("Warning: this program is trying to wear out your " "flash, stop it if this is not wanted.\n" );if (dev <0 ) { -printk (PRINT_PREF "Please specify a valid mtd-device via module paramter\n" ); -printk (KERN_CRIT "CAREFUL: This test wipes all data on the specified MTD device!\n" ); +pr_info ("Please specify a valid mtd-device via module paramter\n" ); +pr_crit ("CAREFUL: This test wipes all data on the specified MTD device!\n" );return -EINVAL ; } -printk (PRINT_PREF "MTD device: %d\n" , dev); -printk (PRINT_PREF "torture %d eraseblocks (%d-%d) of mtd%d\n" , +pr_info ("MTD device: %d\n" , dev); +pr_info ("torture %d eraseblocks (%d-%d) of mtd%d\n" , ebcnt, eb, eb + ebcnt -1 , dev);if (pgcnt) -printk (PRINT_PREF "torturing just %d pages per eraseblock\n" , +pr_info ("torturing just %d pages per eraseblock\n" , pgcnt); -printk (PRINT_PREF "write verify %s\n" , check ?"enabled" :"disabled" ); +pr_info ("write verify %s\n" , check ?"enabled" :"disabled" ); mtd =get_mtd_device (NULL , dev);if (IS_ERR (mtd)) { err =PTR_ERR (mtd); -printk (PRINT_PREF "error: cannot get MTD device\n" ); +pr_err ("error: cannot get MTD device\n" );return err; }if (mtd->writesize ==1 ) { -printk (PRINT_PREF "not NAND flash, assume page size is 512 " +pr_info ("not NAND flash, assume page size is 512 " "bytes.\n" ); pgsize =512 ; }else pgsize = mtd->writesize;if (pgcnt && (pgcnt > mtd->erasesize / pgsize || pgcnt <0 )) { -printk (PRINT_PREF "error: invalid pgcnt value %d\n" , pgcnt); +pr_err ("error: invalid pgcnt value %d\n" , pgcnt); goto out_mtd; } err = -ENOMEM ; patt_5A5 =kmalloc (mtd->erasesize,GFP_KERNEL );if (!patt_5A5) { -printk (PRINT_PREF "error: cannot allocate memory\n" ); +pr_err ("error: cannot allocate memory\n" ); goto out_mtd; } patt_A5A =kmalloc (mtd->erasesize,GFP_KERNEL );if (!patt_A5A) { -printk (PRINT_PREF "error: cannot allocate memory\n" ); +pr_err ("error: cannot allocate memory\n" ); goto out_patt_5A5; } patt_FF =kmalloc (mtd->erasesize,GFP_KERNEL );if (!patt_FF) { -printk (PRINT_PREF "error: cannot allocate memory\n" ); +pr_err ("error: cannot allocate memory\n" ); goto out_patt_A5A; } check_buf =kmalloc (mtd->erasesize,GFP_KERNEL );if (!check_buf) { -printk (PRINT_PREF "error: cannot allocate memory\n" ); +pr_err ("error: cannot allocate memory\n" ); goto out_patt_FF; }
@@ -295,13 +296,13 @@ static int __init tort_init(void) err =mtd_block_isbad (mtd, (loff_t )i * mtd->erasesize);if (err <0 ) { -printk (PRINT_PREF "block_isbad() returned %d " +pr_info ("block_isbad() returned %d " "for EB %d\n" , err, i); goto out; }if (err) { -printk ("EB %d is bad. Skip it.\n" , i); +pr_err ("EB %d is bad. Skip it.\n" , i); bad_ebs[i - eb] =1 ; } }
@@ -329,7 +330,7 @@ static int __init tort_init(void)continue ; err =check_eraseblock (i, patt_FF);if (err) { -printk (PRINT_PREF "verify failed" +pr_info ("verify failed" " for 0xFF... pattern\n" ); goto out; }
@@ -362,7 +363,7 @@ static int __init tort_init(void) patt = patt_A5A; err =check_eraseblock (i, patt);if (err) { -printk (PRINT_PREF "verify failed for %s" +pr_info ("verify failed for %s" " pattern\n" , ((eb + erase_cycles) &1 ) ?"0x55AA55..." :"0xAA55AA..." );
@@ -380,7 +381,7 @@ static int __init tort_init(void)stop_timing (); ms = (finish.tv_sec - start.tv_sec) *1000 + (finish.tv_usec - start.tv_usec) /1000 ; -printk (PRINT_PREF "%08u erase cycles done, took %lu " +pr_info ("%08u erase cycles done, took %lu " "milliseconds (%lu seconds)\n" , erase_cycles, ms, ms /1000 );start_timing ();
@@ -391,7 +392,7 @@ static int __init tort_init(void) } out: -printk (PRINT_PREF "finished after %u erase cycles\n" , +pr_info ("finished after %u erase cycles\n" , erase_cycles);kfree (check_buf); out_patt_FF:
@@ -403,7 +404,7 @@ out_patt_5A5: out_mtd:put_mtd_device (mtd);if (err) -printk (PRINT_PREF "error %d occurred during torturing\n" , err); +pr_info ("error %d occurred during torturing\n" , err);printk (KERN_INFO "=================================================\n" );return err; }
@@ -441,9 +442,9 @@ static void report_corrupt(unsigned char *read, unsigned char *written) &bits) >= 0) pages++; -printk (PRINT_PREF "verify fails on %d pages, %d bytes/%d bits\n" , +pr_info ("verify fails on %d pages, %d bytes/%d bits\n" , pages, bytes, bits); -printk (PRINT_PREF "The following is a list of all differences between" +pr_info ("The following is a list of all differences between" " what was read from flash and what was expected\n" );for (i =0 ; i < check_len; i += pgsize) {
@@ -457,7 +458,7 @@ static void report_corrupt(unsigned char *read, unsigned char *written)printk ("-------------------------------------------------------" "----------------------------------\n" ); -printk (PRINT_PREF "Page %zd has %d bytes/%d bits failing verify," +pr_info ("Page %zd has %d bytes/%d bits failing verify," " starting at offset 0x%x\n" , (mtd->erasesize - check_len + i) / pgsize, bytes, bits, first);
Signature · 1 line
1.7.4.1
PATCH RESEND 9/9 mtd: mtd_oobtest: printk -> pr_{info,err,crit}
In reply to Vikram NarayananUse pr_info() and pr_err() while defining pr_fmt(). This saves a few characters, joins a few lines, and makes the code a little more readable (and grep-able).
Signed-off-by Brian Norris <[email protected]>
Signed-off-by Vikram Narayanan <[email protected]>
--- drivers/mtd/tests/mtd_oobtest.c | 171 +++++++++++++++++++-------------------- 1 files changed, 84 insertions(+), 87 deletions(-)
drivers/mtd/tests/mtd_oobtest.c +84 -87
@@ -19,6 +19,8 @@* Author: Adrian Hunter <[email protected]> */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <asm/div64.h> #include <linux/init.h> #include <linux/module.h>
@@ -28,8 +30,6 @@#include <linux/slab.h> #include <linux/sched.h> -#define PRINT_PREF KERN_INFO "mtd_oobtest: " -static int dev = -EINVAL ;module_param (dev, int,S_IRUGO );MODULE_PARM_DESC (dev,"MTD device number to use" );
@@ -80,13 +80,12 @@ static int erase_eraseblock(int ebnum) err =mtd_erase (mtd, &ei);if (err) { -printk (PRINT_PREF "error %d while erasing EB %d\n" , err, ebnum); +pr_err ("error %d while erasing EB %d\n" , err, ebnum);return err; }if (ei.state ==MTD_ERASE_FAILED ) { -printk (PRINT_PREF "some erase error occurred at EB %d\n" , - ebnum); +pr_err ("some erase error occurred at EB %d\n" , ebnum);return -EIO ; }
@@ -98,7 +97,7 @@ static int erase_whole_device(void)int err;unsigned int i; -printk (PRINT_PREF "erasing whole device\n" ); +pr_info ("erasing whole device\n" );for (i =0 ; i < ebcnt; ++i) {if (bbt[i])continue ;
@@ -107,7 +106,7 @@ static int erase_whole_device(void)return err;cond_resched (); } -printk (PRINT_PREF "erased %u eraseblocks\n" , i); +pr_info ("erased %u eraseblocks\n" , i);return 0 ; }
@@ -141,9 +140,9 @@ static int write_eraseblock(int ebnum) ops.oobbuf = writebuf; err =mtd_write_oob (mtd, addr, &ops);if (err || ops.oobretlen != use_len) { -printk (PRINT_PREF "error: writeoob failed at %#llx\n" , +pr_err ("error: writeoob failed at %#llx\n" , (long long )addr); -printk (PRINT_PREF "error: use_len %d, use_offset %d\n" , +pr_err ("error: use_len %d, use_offset %d\n" , use_len, use_offset); errcnt +=1 ;return err ? err :-1 ;
@@ -160,7 +159,7 @@ static int write_whole_device(void)int err;unsigned int i; -printk (PRINT_PREF "writing OOBs of whole device\n" ); +pr_info ("writing OOBs of whole device\n" );for (i =0 ; i < ebcnt; ++i) {if (bbt[i])continue ;
@@ -168,10 +167,10 @@ static int write_whole_device(void)if (err)return err;if (i %256 ==0 ) -printk (PRINT_PREF "written up to eraseblock %u\n" , i); +pr_info ("written up to eraseblock %u\n" , i);cond_resched (); } -printk (PRINT_PREF "written %u eraseblocks\n" , i); +pr_info ("written %u eraseblocks\n" , i);return 0 ; }
@@ -194,17 +193,17 @@ static int verify_eraseblock(int ebnum) ops.oobbuf = readbuf; err =mtd_read_oob (mtd, addr, &ops);if (err || ops.oobretlen != use_len) { -printk (PRINT_PREF "error: readoob failed at %#llx\n" , +pr_err ("error: readoob failed at %#llx\n" , (long long )addr); errcnt +=1 ;return err ? err :-1 ; }if (memcmp (readbuf, writebuf, use_len)) { -printk (PRINT_PREF "error: verify failed at %#llx\n" , +pr_err ("error: verify failed at %#llx\n" , (long long )addr); errcnt +=1 ;if (errcnt >1000 ) { -printk (PRINT_PREF "error: too many errors\n" ); +pr_err ("error: too many errors\n" );return -1 ; } }
@@ -221,29 +220,28 @@ static int verify_eraseblock(int ebnum) ops.oobbuf = readbuf; err =mtd_read_oob (mtd, addr, &ops);if (err || ops.oobretlen != mtd->ecclayout->oobavail) { -printk (PRINT_PREF "error: readoob failed at " -"%#llx\n" , (long long )addr); +pr_err ("error: readoob failed at %#llx\n" , + (long long )addr); errcnt +=1 ;return err ? err :-1 ; }if (memcmp (readbuf + use_offset, writebuf, use_len)) { -printk (PRINT_PREF "error: verify failed at " -"%#llx\n" , (long long )addr); +pr_err ("error: verify failed at %#llx\n" , + (long long )addr); errcnt +=1 ;if (errcnt >1000 ) { -printk (PRINT_PREF "error: too many " -"errors\n" ); +pr_err ("error: too many errors\n" );return -1 ; } }for (k =0 ; k < use_offset; ++k)if (readbuf[k] !=0xff ) { -printk (PRINT_PREF "error: verify 0xff " +pr_err ("error: verify 0xff " "failed at %#llx\n" , (long long )addr); errcnt +=1 ;if (errcnt >1000 ) { -printk (PRINT_PREF "error: too " +pr_err ("error: too " "many errors\n" );return -1 ; }
@@ -251,12 +249,12 @@ static int verify_eraseblock(int ebnum)for (k = use_offset + use_len; k < mtd->ecclayout->oobavail; ++k)if (readbuf[k] !=0xff ) { -printk (PRINT_PREF "error: verify 0xff " +pr_err ("error: verify 0xff " "failed at %#llx\n" , (long long )addr); errcnt +=1 ;if (errcnt >1000 ) { -printk (PRINT_PREF "error: too " +pr_err ("error: too " "many errors\n" );return -1 ; }
@@ -286,17 +284,17 @@ static int verify_eraseblock_in_one_go(int ebnum) ops.oobbuf = readbuf; err =mtd_read_oob (mtd, addr, &ops);if (err || ops.oobretlen != len) { -printk (PRINT_PREF "error: readoob failed at %#llx\n" , +pr_err ("error: readoob failed at %#llx\n" , (long long )addr); errcnt +=1 ;return err ? err :-1 ; }if (memcmp (readbuf, writebuf, len)) { -printk (PRINT_PREF "error: verify failed at %#llx\n" , +pr_err ("error: verify failed at %#llx\n" , (long long )addr); errcnt +=1 ;if (errcnt >1000 ) { -printk (PRINT_PREF "error: too many errors\n" ); +pr_err ("error: too many errors\n" );return -1 ; } }
@@ -309,7 +307,7 @@ static int verify_all_eraseblocks(void)int err;unsigned int i; -printk (PRINT_PREF "verifying all eraseblocks\n" ); +pr_info ("verifying all eraseblocks\n" );for (i =0 ; i < ebcnt; ++i) {if (bbt[i])continue ;
@@ -317,10 +315,10 @@ static int verify_all_eraseblocks(void)if (err)return err;if (i %256 ==0 ) -printk (PRINT_PREF "verified up to eraseblock %u\n" , i); +pr_info ("verified up to eraseblock %u\n" , i);cond_resched (); } -printk (PRINT_PREF "verified %u eraseblocks\n" , i); +pr_info ("verified %u eraseblocks\n" , i);return 0 ; }
@@ -331,7 +329,7 @@ static int is_block_bad(int ebnum) ret =mtd_block_isbad (mtd, addr);if (ret) -printk (PRINT_PREF "block %d is bad\n" , ebnum); +pr_info ("block %d is bad\n" , ebnum);return ret; }
@@ -341,18 +339,18 @@ static int scan_for_bad_eraseblocks(void) bbt =kmalloc (ebcnt,GFP_KERNEL );if (!bbt) { -printk (PRINT_PREF "error: cannot allocate memory\n" ); +pr_err ("error: cannot allocate memory\n" );return -ENOMEM ; } -printk (PRINT_PREF "scanning for bad eraseblocks\n" ); +pr_info ("scanning for bad eraseblocks\n" );for (i =0 ; i < ebcnt; ++i) { bbt[i] =is_block_bad (i) ?1 :0 ;if (bbt[i]) bad +=1 ;cond_resched (); } -printk (PRINT_PREF "scanned %d eraseblocks, %d are bad\n" , i, bad); +pr_info ("scanned %d eraseblocks, %d are bad\n" , i, bad);return 0 ; }
@@ -368,22 +366,22 @@ static int __init mtd_oobtest_init(void)printk (KERN_INFO "=================================================\n" );if (dev <0 ) { -printk (PRINT_PREF "Please specify a valid mtd-device via module paramter\n" ); -printk (KERN_CRIT "CAREFUL: This test wipes all data on the specified MTD device!\n" ); +pr_info ("Please specify a valid mtd-device via module paramter\n" ); +pr_crit (KERN_CRIT "CAREFUL: This test wipes all data on the specified MTD device!\n" );return -EINVAL ; } -printk (PRINT_PREF "MTD device: %d\n" , dev); +pr_info ("MTD device: %d\n" , dev); mtd =get_mtd_device (NULL , dev);if (IS_ERR (mtd)) { err =PTR_ERR (mtd); -printk (PRINT_PREF "error: cannot get MTD device\n" ); +pr_err ("error: cannot get MTD device\n" );return err; }if (mtd->type !=MTD_NANDFLASH ) { -printk (PRINT_PREF "this test requires NAND flash\n" ); +pr_info ("this test requires NAND flash\n" ); goto out; }
@@ -392,7 +390,7 @@ static int __init mtd_oobtest_init(void) ebcnt = tmp; pgcnt = mtd->erasesize / mtd->writesize; - printk(PRINT_PREF "MTD device size %llu, eraseblock size %u, " + pr_info("MTD device size %llu, eraseblock size %u, " "page size %u, count of eraseblocks %u, pages per " "eraseblock %u, OOB size %u\n", (unsigned long long)mtd->size, mtd->erasesize,
@@ -401,12 +399,12 @@ static int __init mtd_oobtest_init(void) err = -ENOMEM ; readbuf =kmalloc (mtd->erasesize,GFP_KERNEL );if (!readbuf) { -printk (PRINT_PREF "error: cannot allocate memory\n" ); +pr_err ("error: cannot allocate memory\n" ); goto out; } writebuf =kmalloc (mtd->erasesize,GFP_KERNEL );if (!writebuf) { -printk (PRINT_PREF "error: cannot allocate memory\n" ); +pr_err ("error: cannot allocate memory\n" ); goto out; }
@@ -420,7 +418,7 @@ static int __init mtd_oobtest_init(void) vary_offset =0 ;/* First test: write all OOB, read it back and verify */ -printk (PRINT_PREF "test 1 of 5\n" ); +pr_info ("test 1 of 5\n" ); err =erase_whole_device ();if (err)
@@ -440,7 +438,7 @@ static int __init mtd_oobtest_init(void)* Second test: write all OOB, a block at a time, read it back and * verify. */ -printk (PRINT_PREF "test 2 of 5\n" ); +pr_info ("test 2 of 5\n" ); err =erase_whole_device ();if (err)
@@ -453,7 +451,7 @@ static int __init mtd_oobtest_init(void)/* Check all eraseblocks */ simple_srand (3 ); -printk (PRINT_PREF "verifying all eraseblocks\n" ); +pr_info ("verifying all eraseblocks\n" );for (i =0 ; i < ebcnt; ++i) {if (bbt[i])continue ;
@@ -461,16 +459,16 @@ static int __init mtd_oobtest_init(void)if (err) goto out;if (i %256 ==0 ) -printk (PRINT_PREF "verified up to eraseblock %u\n" , i); +pr_info ("verified up to eraseblock %u\n" , i);cond_resched (); } -printk (PRINT_PREF "verified %u eraseblocks\n" , i); +pr_info ("verified %u eraseblocks\n" , i);/* * Third test: write OOB at varying offsets and lengths, read it back * and verify. */ -printk (PRINT_PREF "test 3 of 5\n" ); +pr_info ("test 3 of 5\n" ); err =erase_whole_device ();if (err)
@@ -503,7 +501,7 @@ static int __init mtd_oobtest_init(void) vary_offset =0 ;/* Fourth test: try to write off end of device */ -printk (PRINT_PREF "test 4 of 5\n" ); +pr_info ("test 4 of 5\n" ); err =erase_whole_device ();if (err)
@@ -522,14 +520,14 @@ static int __init mtd_oobtest_init(void) ops.ooboffs = mtd->ecclayout->oobavail; ops.datbuf =NULL ; ops.oobbuf = writebuf; -printk (PRINT_PREF "attempting to start write past end of OOB\n" ); -printk (PRINT_PREF "an error is expected...\n" ); +pr_info ("attempting to start write past end of OOB\n" ); +pr_info ("an error is expected...\n" ); err =mtd_write_oob (mtd, addr0, &ops);if (err) { -printk (PRINT_PREF "error occurred as expected\n" ); +pr_info ("error occurred as expected\n" ); err =0 ; }else { -printk (PRINT_PREF "error: can write past end of OOB\n" ); +pr_err ("error: can write past end of OOB\n" ); errcnt +=1 ; }
@@ -542,19 +540,19 @@ static int __init mtd_oobtest_init(void) ops.ooboffs = mtd->ecclayout->oobavail; ops.datbuf =NULL ; ops.oobbuf = readbuf; -printk (PRINT_PREF "attempting to start read past end of OOB\n" ); -printk (PRINT_PREF "an error is expected...\n" ); +pr_info ("attempting to start read past end of OOB\n" ); +pr_info ("an error is expected...\n" ); err =mtd_read_oob (mtd, addr0, &ops);if (err) { -printk (PRINT_PREF "error occurred as expected\n" ); +pr_info ("error occurred as expected\n" ); err =0 ; }else { -printk (PRINT_PREF "error: can read past end of OOB\n" ); +pr_err ("error: can read past end of OOB\n" ); errcnt +=1 ; }if (bbt[ebcnt -1 ]) -printk (PRINT_PREF "skipping end of device tests because last " +pr_info ("skipping end of device tests because last " "block is bad\n" );else {/* Attempt to write off end of device */
@@ -566,14 +564,14 @@ static int __init mtd_oobtest_init(void) ops.ooboffs =0 ; ops.datbuf =NULL ; ops.oobbuf = writebuf; -printk (PRINT_PREF "attempting to write past end of device\n" ); -printk (PRINT_PREF "an error is expected...\n" ); +pr_info ("attempting to write past end of device\n" ); +pr_info ("an error is expected...\n" ); err =mtd_write_oob (mtd, mtd->size - mtd->writesize, &ops);if (err) { -printk (PRINT_PREF "error occurred as expected\n" ); +pr_info ("error occurred as expected\n" ); err =0 ; }else { -printk (PRINT_PREF "error: wrote past end of device\n" ); +pr_err ("error: wrote past end of device\n" ); errcnt +=1 ; }
@@ -586,14 +584,14 @@ static int __init mtd_oobtest_init(void) ops.ooboffs =0 ; ops.datbuf =NULL ; ops.oobbuf = readbuf; -printk (PRINT_PREF "attempting to read past end of device\n" ); -printk (PRINT_PREF "an error is expected...\n" ); +pr_info ("attempting to read past end of device\n" ); +pr_info ("an error is expected...\n" ); err =mtd_read_oob (mtd, mtd->size - mtd->writesize, &ops);if (err) { -printk (PRINT_PREF "error occurred as expected\n" ); +pr_info ("error occurred as expected\n" ); err =0 ; }else { -printk (PRINT_PREF "error: read past end of device\n" ); +pr_err ("error: read past end of device\n" ); errcnt +=1 ; }
@@ -610,14 +608,14 @@ static int __init mtd_oobtest_init(void) ops.ooboffs =1 ; ops.datbuf =NULL ; ops.oobbuf = writebuf; -printk (PRINT_PREF "attempting to write past end of device\n" ); -printk (PRINT_PREF "an error is expected...\n" ); +pr_info ("attempting to write past end of device\n" ); +pr_info ("an error is expected...\n" ); err =mtd_write_oob (mtd, mtd->size - mtd->writesize, &ops);if (err) { -printk (PRINT_PREF "error occurred as expected\n" ); +pr_info ("error occurred as expected\n" ); err =0 ; }else { -printk (PRINT_PREF "error: wrote past end of device\n" ); +pr_err ("error: wrote past end of device\n" ); errcnt +=1 ; }
@@ -630,20 +628,20 @@ static int __init mtd_oobtest_init(void) ops.ooboffs =1 ; ops.datbuf =NULL ; ops.oobbuf = readbuf; -printk (PRINT_PREF "attempting to read past end of device\n" ); -printk (PRINT_PREF "an error is expected...\n" ); +pr_info ("attempting to read past end of device\n" ); +pr_info ("an error is expected...\n" ); err =mtd_read_oob (mtd, mtd->size - mtd->writesize, &ops);if (err) { -printk (PRINT_PREF "error occurred as expected\n" ); +pr_info ("error occurred as expected\n" ); err =0 ; }else { -printk (PRINT_PREF "error: read past end of device\n" ); +pr_err ("error: read past end of device\n" ); errcnt +=1 ; } }/* Fifth test: write / read across block boundaries */ -printk (PRINT_PREF "test 5 of 5\n" ); +pr_info ("test 5 of 5\n" );/* Erase all eraseblocks */ err =erase_whole_device ();
@@ -652,7 +650,7 @@ static int __init mtd_oobtest_init(void)/* Write all eraseblocks */ simple_srand (11 ); -printk (PRINT_PREF "writing OOBs of whole device\n" ); +pr_info ("writing OOBs of whole device\n" );for (i =0 ; i < ebcnt -1 ; ++i) {int cnt =2 ;int pg;
@@ -674,17 +672,16 @@ static int __init mtd_oobtest_init(void)if (err) goto out;if (i %256 ==0 ) -printk (PRINT_PREF "written up to eraseblock " -"%u\n" , i); +pr_info ("written up to eraseblock %u\n" , i);cond_resched (); addr += mtd->writesize; } } -printk (PRINT_PREF "written %u eraseblocks\n" , i); +pr_info ("written %u eraseblocks\n" , i);/* Check all eraseblocks */ simple_srand (11 ); -printk (PRINT_PREF "verifying all eraseblocks\n" ); +pr_info ("verifying all eraseblocks\n" );for (i =0 ; i < ebcnt -1 ; ++i) {if (bbt[i] || bbt[i +1 ])continue ;
@@ -702,28 +699,28 @@ static int __init mtd_oobtest_init(void)if (err) goto out;if (memcmp (readbuf, writebuf, mtd->ecclayout->oobavail *2 )) { -printk (PRINT_PREF "error: verify failed at %#llx\n" , +pr_err ("error: verify failed at %#llx\n" , (long long )addr); errcnt +=1 ;if (errcnt >1000 ) { -printk (PRINT_PREF "error: too many errors\n" ); +pr_err ("error: too many errors\n" ); goto out; } }if (i %256 ==0 ) -printk (PRINT_PREF "verified up to eraseblock %u\n" , i); +pr_info ("verified up to eraseblock %u\n" , i);cond_resched (); } -printk (PRINT_PREF "verified %u eraseblocks\n" , i); +pr_info ("verified %u eraseblocks\n" , i); -printk (PRINT_PREF "finished with %d errors\n" , errcnt); +pr_info ("finished with %d errors\n" , errcnt); out:kfree (bbt);kfree (writebuf);kfree (readbuf);put_mtd_device (mtd);if (err) -printk (PRINT_PREF "error %d occurred\n" , err); +pr_info ("error %d occurred\n" , err);printk (KERN_INFO "=================================================\n" );return err; }
Signature · 1 line
1.7.4.1
Re: [PATCH RESEND 9/9] mtd: mtd_oobtest: printk -> pr_{info, err, crit}
Quoted 1 line
From
a1969e36d924285da0200c8b932b79165ff7df87Mon Sep 17 00:00:00 2001
From: Brian Norris <[email protected]>
Date: Wed, 26 Sep 2012 16:37:02 +0000
Subject: [PATCH RESEND 9/9] mtd: mtd_oobtest: printk -> pr_{info,err,crit}
Use pr_info() and pr_err() while defining pr_fmt(). This saves a few characters, joins a few lines, and makes the code a little more readable (and grep-able).
Signed-off-by Brian Norris <[email protected]>
Signed-off-by Vikram Narayanan <[email protected]>
---
Posting this patch with the headers, as Brian is the original author. Please take this one and discard the previously posted patch.
drivers/mtd/tests/mtd_oobtest.c | 171 +++++++++++++++++++-------------------- 1 files changed, 84 insertions(+), 87 deletions(-)
drivers/mtd/tests/mtd_oobtest.c +84 -87
@@ -19,6 +19,8 @@* Author: Adrian Hunter <[email protected]> */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <asm/div64.h> #include <linux/init.h> #include <linux/module.h>
@@ -28,8 +30,6 @@#include <linux/slab.h> #include <linux/sched.h> -#define PRINT_PREF KERN_INFO "mtd_oobtest: " -static int dev = -EINVAL ;module_param (dev, int,S_IRUGO );MODULE_PARM_DESC (dev,"MTD device number to use" );
@@ -80,13 +80,12 @@ static int erase_eraseblock(int ebnum) err =mtd_erase (mtd, &ei);if (err) { -printk (PRINT_PREF "error %d while erasing EB %d\n" , err, ebnum); +pr_err ("error %d while erasing EB %d\n" , err, ebnum);return err; }if (ei.state ==MTD_ERASE_FAILED ) { -printk (PRINT_PREF "some erase error occurred at EB %d\n" , - ebnum); +pr_err ("some erase error occurred at EB %d\n" , ebnum);return -EIO ; }
@@ -98,7 +97,7 @@ static int erase_whole_device(void)int err;unsigned int i; -printk (PRINT_PREF "erasing whole device\n" ); +pr_info ("erasing whole device\n" );for (i =0 ; i < ebcnt; ++i) {if (bbt[i])continue ;
@@ -107,7 +106,7 @@ static int erase_whole_device(void)return err;cond_resched (); } -printk (PRINT_PREF "erased %u eraseblocks\n" , i); +pr_info ("erased %u eraseblocks\n" , i);return 0 ; }
@@ -141,9 +140,9 @@ static int write_eraseblock(int ebnum) ops.oobbuf = writebuf; err =mtd_write_oob (mtd, addr, &ops);if (err || ops.oobretlen != use_len) { -printk (PRINT_PREF "error: writeoob failed at %#llx\n" , +pr_err ("error: writeoob failed at %#llx\n" , (long long )addr); -printk (PRINT_PREF "error: use_len %d, use_offset %d\n" , +pr_err ("error: use_len %d, use_offset %d\n" , use_len, use_offset); errcnt +=1 ;return err ? err :-1 ;
@@ -160,7 +159,7 @@ static int write_whole_device(void)int err;unsigned int i; -printk (PRINT_PREF "writing OOBs of whole device\n" ); +pr_info ("writing OOBs of whole device\n" );for (i =0 ; i < ebcnt; ++i) {if (bbt[i])continue ;
@@ -168,10 +167,10 @@ static int write_whole_device(void)if (err)return err;if (i %256 ==0 ) -printk (PRINT_PREF "written up to eraseblock %u\n" , i); +pr_info ("written up to eraseblock %u\n" , i);cond_resched (); } -printk (PRINT_PREF "written %u eraseblocks\n" , i); +pr_info ("written %u eraseblocks\n" , i);return 0 ; }
@@ -194,17 +193,17 @@ static int verify_eraseblock(int ebnum) ops.oobbuf = readbuf; err =mtd_read_oob (mtd, addr, &ops);if (err || ops.oobretlen != use_len) { -printk (PRINT_PREF "error: readoob failed at %#llx\n" , +pr_err ("error: readoob failed at %#llx\n" , (long long )addr); errcnt +=1 ;return err ? err :-1 ; }if (memcmp (readbuf, writebuf, use_len)) { -printk (PRINT_PREF "error: verify failed at %#llx\n" , +pr_err ("error: verify failed at %#llx\n" , (long long )addr); errcnt +=1 ;if (errcnt >1000 ) { -printk (PRINT_PREF "error: too many errors\n" ); +pr_err ("error: too many errors\n" );return -1 ; } }
@@ -221,29 +220,28 @@ static int verify_eraseblock(int ebnum) ops.oobbuf = readbuf; err =mtd_read_oob (mtd, addr, &ops);if (err || ops.oobretlen != mtd->ecclayout->oobavail) { -printk (PRINT_PREF "error: readoob failed at " -"%#llx\n" , (long long )addr); +pr_err ("error: readoob failed at %#llx\n" , + (long long )addr); errcnt +=1 ;return err ? err :-1 ; }if (memcmp (readbuf + use_offset, writebuf, use_len)) { -printk (PRINT_PREF "error: verify failed at " -"%#llx\n" , (long long )addr); +pr_err ("error: verify failed at %#llx\n" , + (long long )addr); errcnt +=1 ;if (errcnt >1000 ) { -printk (PRINT_PREF "error: too many " -"errors\n" ); +pr_err ("error: too many errors\n" );return -1 ; } }for (k =0 ; k < use_offset; ++k)if (readbuf[k] !=0xff ) { -printk (PRINT_PREF "error: verify 0xff " +pr_err ("error: verify 0xff " "failed at %#llx\n" , (long long )addr); errcnt +=1 ;if (errcnt >1000 ) { -printk (PRINT_PREF "error: too " +pr_err ("error: too " "many errors\n" );return -1 ; }
@@ -251,12 +249,12 @@ static int verify_eraseblock(int ebnum)for (k = use_offset + use_len; k < mtd->ecclayout->oobavail; ++k)if (readbuf[k] !=0xff ) { -printk (PRINT_PREF "error: verify 0xff " +pr_err ("error: verify 0xff " "failed at %#llx\n" , (long long )addr); errcnt +=1 ;if (errcnt >1000 ) { -printk (PRINT_PREF "error: too " +pr_err ("error: too " "many errors\n" );return -1 ; }
@@ -286,17 +284,17 @@ static int verify_eraseblock_in_one_go(int ebnum) ops.oobbuf = readbuf; err =mtd_read_oob (mtd, addr, &ops);if (err || ops.oobretlen != len) { -printk (PRINT_PREF "error: readoob failed at %#llx\n" , +pr_err ("error: readoob failed at %#llx\n" , (long long )addr); errcnt +=1 ;return err ? err :-1 ; }if (memcmp (readbuf, writebuf, len)) { -printk (PRINT_PREF "error: verify failed at %#llx\n" , +pr_err ("error: verify failed at %#llx\n" , (long long )addr); errcnt +=1 ;if (errcnt >1000 ) { -printk (PRINT_PREF "error: too many errors\n" ); +pr_err ("error: too many errors\n" );return -1 ; } }
@@ -309,7 +307,7 @@ static int verify_all_eraseblocks(void)int err;unsigned int i; -printk (PRINT_PREF "verifying all eraseblocks\n" ); +pr_info ("verifying all eraseblocks\n" );for (i =0 ; i < ebcnt; ++i) {if (bbt[i])continue ;
@@ -317,10 +315,10 @@ static int verify_all_eraseblocks(void)if (err)return err;if (i %256 ==0 ) -printk (PRINT_PREF "verified up to eraseblock %u\n" , i); +pr_info ("verified up to eraseblock %u\n" , i);cond_resched (); } -printk (PRINT_PREF "verified %u eraseblocks\n" , i); +pr_info ("verified %u eraseblocks\n" , i);return 0 ; }
@@ -331,7 +329,7 @@ static int is_block_bad(int ebnum) ret =mtd_block_isbad (mtd, addr);if (ret) -printk (PRINT_PREF "block %d is bad\n" , ebnum); +pr_info ("block %d is bad\n" , ebnum);return ret; }
@@ -341,18 +339,18 @@ static int scan_for_bad_eraseblocks(void) bbt =kmalloc (ebcnt,GFP_KERNEL );if (!bbt) { -printk (PRINT_PREF "error: cannot allocate memory\n" ); +pr_err ("error: cannot allocate memory\n" );return -ENOMEM ; } -printk (PRINT_PREF "scanning for bad eraseblocks\n" ); +pr_info ("scanning for bad eraseblocks\n" );for (i =0 ; i < ebcnt; ++i) { bbt[i] =is_block_bad (i) ?1 :0 ;if (bbt[i]) bad +=1 ;cond_resched (); } -printk (PRINT_PREF "scanned %d eraseblocks, %d are bad\n" , i, bad); +pr_info ("scanned %d eraseblocks, %d are bad\n" , i, bad);return 0 ; }
@@ -368,22 +366,22 @@ static int __init mtd_oobtest_init(void)printk (KERN_INFO "=================================================\n" );if (dev <0 ) { -printk (PRINT_PREF "Please specify a valid mtd-device via module paramter\n" ); -printk (KERN_CRIT "CAREFUL: This test wipes all data on the specified MTD device!\n" ); +pr_info ("Please specify a valid mtd-device via module paramter\n" ); +pr_crit (KERN_CRIT "CAREFUL: This test wipes all data on the specified MTD device!\n" );return -EINVAL ; } -printk (PRINT_PREF "MTD device: %d\n" , dev); +pr_info ("MTD device: %d\n" , dev); mtd =get_mtd_device (NULL , dev);if (IS_ERR (mtd)) { err =PTR_ERR (mtd); -printk (PRINT_PREF "error: cannot get MTD device\n" ); +pr_err ("error: cannot get MTD device\n" );return err; }if (mtd->type !=MTD_NANDFLASH ) { -printk (PRINT_PREF "this test requires NAND flash\n" ); +pr_info ("this test requires NAND flash\n" ); goto out; }
@@ -392,7 +390,7 @@ static int __init mtd_oobtest_init(void) ebcnt = tmp; pgcnt = mtd->erasesize / mtd->writesize; - printk(PRINT_PREF "MTD device size %llu, eraseblock size %u, " + pr_info("MTD device size %llu, eraseblock size %u, " "page size %u, count of eraseblocks %u, pages per " "eraseblock %u, OOB size %u\n", (unsigned long long)mtd->size, mtd->erasesize,
@@ -401,12 +399,12 @@ static int __init mtd_oobtest_init(void) err = -ENOMEM ; readbuf =kmalloc (mtd->erasesize,GFP_KERNEL );if (!readbuf) { -printk (PRINT_PREF "error: cannot allocate memory\n" ); +pr_err ("error: cannot allocate memory\n" ); goto out; } writebuf =kmalloc (mtd->erasesize,GFP_KERNEL );if (!writebuf) { -printk (PRINT_PREF "error: cannot allocate memory\n" ); +pr_err ("error: cannot allocate memory\n" ); goto out; }
@@ -420,7 +418,7 @@ static int __init mtd_oobtest_init(void) vary_offset =0 ;/* First test: write all OOB, read it back and verify */ -printk (PRINT_PREF "test 1 of 5\n" ); +pr_info ("test 1 of 5\n" ); err =erase_whole_device ();if (err)
@@ -440,7 +438,7 @@ static int __init mtd_oobtest_init(void)* Second test: write all OOB, a block at a time, read it back and * verify. */ -printk (PRINT_PREF "test 2 of 5\n" ); +pr_info ("test 2 of 5\n" ); err =erase_whole_device ();if (err)
@@ -453,7 +451,7 @@ static int __init mtd_oobtest_init(void)/* Check all eraseblocks */ simple_srand (3 ); -printk (PRINT_PREF "verifying all eraseblocks\n" ); +pr_info ("verifying all eraseblocks\n" );for (i =0 ; i < ebcnt; ++i) {if (bbt[i])continue ;
@@ -461,16 +459,16 @@ static int __init mtd_oobtest_init(void)if (err) goto out;if (i %256 ==0 ) -printk (PRINT_PREF "verified up to eraseblock %u\n" , i); +pr_info ("verified up to eraseblock %u\n" , i);cond_resched (); } -printk (PRINT_PREF "verified %u eraseblocks\n" , i); +pr_info ("verified %u eraseblocks\n" , i);/* * Third test: write OOB at varying offsets and lengths, read it back * and verify. */ -printk (PRINT_PREF "test 3 of 5\n" ); +pr_info ("test 3 of 5\n" ); err =erase_whole_device ();if (err)
@@ -503,7 +501,7 @@ static int __init mtd_oobtest_init(void) vary_offset =0 ;/* Fourth test: try to write off end of device */ -printk (PRINT_PREF "test 4 of 5\n" ); +pr_info ("test 4 of 5\n" ); err =erase_whole_device ();if (err)
@@ -522,14 +520,14 @@ static int __init mtd_oobtest_init(void) ops.ooboffs = mtd->ecclayout->oobavail; ops.datbuf =NULL ; ops.oobbuf = writebuf; -printk (PRINT_PREF "attempting to start write past end of OOB\n" ); -printk (PRINT_PREF "an error is expected...\n" ); +pr_info ("attempting to start write past end of OOB\n" ); +pr_info ("an error is expected...\n" ); err =mtd_write_oob (mtd, addr0, &ops);if (err) { -printk (PRINT_PREF "error occurred as expected\n" ); +pr_info ("error occurred as expected\n" ); err =0 ; }else { -printk (PRINT_PREF "error: can write past end of OOB\n" ); +pr_err ("error: can write past end of OOB\n" ); errcnt +=1 ; }
@@ -542,19 +540,19 @@ static int __init mtd_oobtest_init(void) ops.ooboffs = mtd->ecclayout->oobavail; ops.datbuf =NULL ; ops.oobbuf = readbuf; -printk (PRINT_PREF "attempting to start read past end of OOB\n" ); -printk (PRINT_PREF "an error is expected...\n" ); +pr_info ("attempting to start read past end of OOB\n" ); +pr_info ("an error is expected...\n" ); err =mtd_read_oob (mtd, addr0, &ops);if (err) { -printk (PRINT_PREF "error occurred as expected\n" ); +pr_info ("error occurred as expected\n" ); err =0 ; }else { -printk (PRINT_PREF "error: can read past end of OOB\n" ); +pr_err ("error: can read past end of OOB\n" ); errcnt +=1 ; }if (bbt[ebcnt -1 ]) -printk (PRINT_PREF "skipping end of device tests because last " +pr_info ("skipping end of device tests because last " "block is bad\n" );else {/* Attempt to write off end of device */
@@ -566,14 +564,14 @@ static int __init mtd_oobtest_init(void) ops.ooboffs =0 ; ops.datbuf =NULL ; ops.oobbuf = writebuf; -printk (PRINT_PREF "attempting to write past end of device\n" ); -printk (PRINT_PREF "an error is expected...\n" ); +pr_info ("attempting to write past end of device\n" ); +pr_info ("an error is expected...\n" ); err =mtd_write_oob (mtd, mtd->size - mtd->writesize, &ops);if (err) { -printk (PRINT_PREF "error occurred as expected\n" ); +pr_info ("error occurred as expected\n" ); err =0 ; }else { -printk (PRINT_PREF "error: wrote past end of device\n" ); +pr_err ("error: wrote past end of device\n" ); errcnt +=1 ; }
@@ -586,14 +584,14 @@ static int __init mtd_oobtest_init(void) ops.ooboffs =0 ; ops.datbuf =NULL ; ops.oobbuf = readbuf; -printk (PRINT_PREF "attempting to read past end of device\n" ); -printk (PRINT_PREF "an error is expected...\n" ); +pr_info ("attempting to read past end of device\n" ); +pr_info ("an error is expected...\n" ); err =mtd_read_oob (mtd, mtd->size - mtd->writesize, &ops);if (err) { -printk (PRINT_PREF "error occurred as expected\n" ); +pr_info ("error occurred as expected\n" ); err =0 ; }else { -printk (PRINT_PREF "error: read past end of device\n" ); +pr_err ("error: read past end of device\n" ); errcnt +=1 ; }
@@ -610,14 +608,14 @@ static int __init mtd_oobtest_init(void) ops.ooboffs =1 ; ops.datbuf =NULL ; ops.oobbuf = writebuf; -printk (PRINT_PREF "attempting to write past end of device\n" ); -printk (PRINT_PREF "an error is expected...\n" ); +pr_info ("attempting to write past end of device\n" ); +pr_info ("an error is expected...\n" ); err =mtd_write_oob (mtd, mtd->size - mtd->writesize, &ops);if (err) { -printk (PRINT_PREF "error occurred as expected\n" ); +pr_info ("error occurred as expected\n" ); err =0 ; }else { -printk (PRINT_PREF "error: wrote past end of device\n" ); +pr_err ("error: wrote past end of device\n" ); errcnt +=1 ; }
@@ -630,20 +628,20 @@ static int __init mtd_oobtest_init(void) ops.ooboffs =1 ; ops.datbuf =NULL ; ops.oobbuf = readbuf; -printk (PRINT_PREF "attempting to read past end of device\n" ); -printk (PRINT_PREF "an error is expected...\n" ); +pr_info ("attempting to read past end of device\n" ); +pr_info ("an error is expected...\n" ); err =mtd_read_oob (mtd, mtd->size - mtd->writesize, &ops);if (err) { -printk (PRINT_PREF "error occurred as expected\n" ); +pr_info ("error occurred as expected\n" ); err =0 ; }else { -printk (PRINT_PREF "error: read past end of device\n" ); +pr_err ("error: read past end of device\n" ); errcnt +=1 ; } }/* Fifth test: write / read across block boundaries */ -printk (PRINT_PREF "test 5 of 5\n" ); +pr_info ("test 5 of 5\n" );/* Erase all eraseblocks */ err =erase_whole_device ();
@@ -652,7 +650,7 @@ static int __init mtd_oobtest_init(void)/* Write all eraseblocks */ simple_srand (11 ); -printk (PRINT_PREF "writing OOBs of whole device\n" ); +pr_info ("writing OOBs of whole device\n" );for (i =0 ; i < ebcnt -1 ; ++i) {int cnt =2 ;int pg;
@@ -674,17 +672,16 @@ static int __init mtd_oobtest_init(void)if (err) goto out;if (i %256 ==0 ) -printk (PRINT_PREF "written up to eraseblock " -"%u\n" , i); +pr_info ("written up to eraseblock %u\n" , i);cond_resched (); addr += mtd->writesize; } } -printk (PRINT_PREF "written %u eraseblocks\n" , i); +pr_info ("written %u eraseblocks\n" , i);/* Check all eraseblocks */ simple_srand (11 ); -printk (PRINT_PREF "verifying all eraseblocks\n" ); +pr_info ("verifying all eraseblocks\n" );for (i =0 ; i < ebcnt -1 ; ++i) {if (bbt[i] || bbt[i +1 ])continue ;
@@ -702,28 +699,28 @@ static int __init mtd_oobtest_init(void)if (err) goto out;if (memcmp (readbuf, writebuf, mtd->ecclayout->oobavail *2 )) { -printk (PRINT_PREF "error: verify failed at %#llx\n" , +pr_err ("error: verify failed at %#llx\n" , (long long )addr); errcnt +=1 ;if (errcnt >1000 ) { -printk (PRINT_PREF "error: too many errors\n" ); +pr_err ("error: too many errors\n" ); goto out; } }if (i %256 ==0 ) -printk (PRINT_PREF "verified up to eraseblock %u\n" , i); +pr_info ("verified up to eraseblock %u\n" , i);cond_resched (); } -printk (PRINT_PREF "verified %u eraseblocks\n" , i); +pr_info ("verified %u eraseblocks\n" , i); -printk (PRINT_PREF "finished with %d errors\n" , errcnt); +pr_info ("finished with %d errors\n" , errcnt); out:kfree (bbt);kfree (writebuf);kfree (readbuf);put_mtd_device (mtd);if (err) -printk (PRINT_PREF "error %d occurred\n" , err); +pr_info ("error %d occurred\n" , err);printk (KERN_INFO "=================================================\n" );return err; }
Signature · 1 line
1.7.4.1
Quoted 5 lines · Vikram Narayanan
This patch series removes the usage of
PRINT_PREFand printk's and replaces it with pr_{info,err,crit} whichever is applicable.Cc Brian Norris <[email protected]>Cc Artem Bityutskiy <[email protected]>
Pushed the series to l2-mtd.git, thanks!
You can send the erase helper patch as well. I think you can put this helper to mtdcore.c. And I think UBI and JFFS2 and may be mtdswap and other drivers may reuse it - you can take a look.
Signature · 2 lines
Best Regards, Artem Bityutskiy
Quoted 8 lines · Artem Bityutskiy
Quoted 5 lines · Vikram Narayanan
This patch series removes the usage of
PRINT_PREFand printk's and replaces it with pr_{info,err,crit} whichever is applicable.Cc Brian Norris<[email protected]>Cc Artem Bityutskiy<[email protected]>Pushed the series to l2-mtd.git, thanks!
Thanks Artem. Can you please make Brian Norris as the author for the last patch? i.e., mtd: mtd_oobtest: printk -> pr_{info,err,crit}
I forgot to post the patch with the original headers. But I've reposted it a few days back. Sorry about that.
Quoted 4 lines
You can send the erase helper patch as well. I think you can put this helper to
mtdcore.c. And I think UBI and JFFS2 and may be mtdswap and other drivers may reuse it - you can take a look.
Yeah, Sure. I need to grep into the sources to find the users of it. I'll post it soon.
Thanks,
Vikram