Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...

[~andy/linux] / fs / jffs2 / summary.c

diff --git a/fs/jffs2/summary.c b/fs/jffs2/summary.c
index e537fb0e0184e97eae8907a97c34d46920d9f129..c522d098bb4fb622112b069c6b5556d7f31ef46a 100644 (file)
--- a/fs/jffs2/summary.c
+++ b/fs/jffs2/summary.c
@@ -11,6 +11,8 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/mtd/mtd.h>
@@ -442,13 +444,16 @@ static int jffs2_sum_process_sum_data(struct jffs2_sb_info *c, struct jffs2_eras
                                /* This should never happen, but https://dev.laptop.org/ticket/4184 */
                                checkedlen = strnlen(spd->name, spd->nsize);
                                if (!checkedlen) {
-                                       printk(KERN_ERR "Dirent at %08x has zero at start of name. Aborting mount.\n",
-                                              jeb->offset + je32_to_cpu(spd->offset));
+                                       pr_err("Dirent at %08x has zero at start of name. Aborting mount.\n",
+                                              jeb->offset +
+                                              je32_to_cpu(spd->offset));
                                        return -EIO;
                                }
                                if (checkedlen < spd->nsize) {
-                                       printk(KERN_ERR "Dirent at %08x has zeroes in name. Truncating to %d chars\n",
-                                              jeb->offset + je32_to_cpu(spd->offset), checkedlen);
+                                       pr_err("Dirent at %08x has zeroes in name. Truncating to %d chars\n",
+                                              jeb->offset +
+                                              je32_to_cpu(spd->offset),
+                                              checkedlen);
                                }
 
 
@@ -808,8 +813,7 @@ static int jffs2_sum_write_data(struct jffs2_sb_info *c, struct jffs2_eraseblock
 
        sum_ofs = jeb->offset + c->sector_size - jeb->free_size;
 
-       dbg_summary("JFFS2: writing out data to flash to pos : 0x%08x\n",
-                   sum_ofs);
+       dbg_summary("writing out data to flash to pos : 0x%08x\n", sum_ofs);
 
        ret = jffs2_flash_writev(c, vecs, 2, sum_ofs, &retlen, 0);