Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ae0086cf authored by Vikram Narayanan's avatar Vikram Narayanan Committed by Artem Bityutskiy
Browse files

mtd: tests: mtd_stresstest: Replace printk with pr_{info,crit,err} 



Use pr_fmt instead of PRINT_PREF macro

Signed-off-by: default avatarVikram Narayanan <vikram186@gmail.com>
Signed-off-by: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
parent e45048a6

drivers/mtd/tests/mtd_stresstest.c

+22 −22
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ 
 * Author: Adrian Hunter <ext-adrian.hunter@nokia.com>

 */



#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 @@ static int __init mtd_stresstest_init(void) 
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;

}