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

Use pr_fmt instead of PRINT_PREF macro

Signed-off-by: Vikram Narayanan <vikram186@gmail.com>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>

diff --git a/drivers/mtd/tests/mtd_speedtest.c b/drivers/mtd/tests/mtd_speedtest.c
index 42b0f7456fc4a4876d94ed1131c5dab1c7ff7dee..8a5803b1724cef4a4eb56e4258f7f9e6960ab53c 100644 (file)
--- a/drivers/mtd/tests/mtd_speedtest.c
+++ b/drivers/mtd/tests/mtd_speedtest.c
@@ -19,6 +19,8 @@
  * Author: Adrian Hunter <adrian.hunter@nokia.com>
  */
 
+#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;
 }