mtd: tests: mtd_pagetest: 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>

1 files changed, 76 insertions, 76 deletions

diff --git a/drivers/mtd/tests/mtd_pagetest.c b/drivers/mtd/tests/mtd_pagetest.c
index 252ddb092fb2..3ba2a77dbdaa 100644
--- a/drivers/mtd/tests/mtd_pagetest.c
+++ b/drivers/mtd/tests/mtd_pagetest.c
@@ -19,6 +19,8 @@
  * Author: Adrian Hunter <ext-adrian.hunter@nokia.com>
  */
 
+#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)