1 files changed, 18 insertions, 14 deletions

diff --git a/fs/jffs2/compr.c b/fs/jffs2/compr.c
index 96ed3c9ec3fc..4849a4c9a0e2 100644
--- a/fs/jffs2/compr.c
+++ b/fs/jffs2/compr.c
@@ -12,6 +12,8 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include "compr.h"
 
 static DEFINE_SPINLOCK(jffs2_compressor_list_lock);
@@ -79,7 +81,7 @@ static int jffs2_selected_compress(u8 compr, unsigned char *data_in,
 
         output_buf = kmalloc(*cdatalen, GFP_KERNEL);
         if (!output_buf) {
-                printk(KERN_WARNING "JFFS2: No memory for compressor allocation. Compression failed.\n");
+                pr_warn("No memory for compressor allocation. Compression failed.\n");
                 return ret;
         }
         orig_slen = *datalen;
@@ -188,7 +190,8 @@ uint16_t jffs2_compress(struct jffs2_sb_info *c, struct jffs2_inode_info *f,
                                 tmp_buf = kmalloc(orig_slen, GFP_KERNEL);
                                 spin_lock(&jffs2_compressor_list_lock);
                                 if (!tmp_buf) {
-                                        printk(KERN_WARNING "JFFS2: No memory for compressor allocation. (%d bytes)\n", orig_slen);
+                                        pr_warn("No memory for compressor allocation. (%d bytes)\n",
+                                                orig_slen);
                                         continue;
                                 }
                                 else {
@@ -235,7 +238,7 @@ uint16_t jffs2_compress(struct jffs2_sb_info *c, struct jffs2_inode_info *f,
                                 cpage_out, datalen, cdatalen);
                 break;
         default:
-                printk(KERN_ERR "JFFS2: unknown compression mode.\n");
+                pr_err("unknown compression mode\n");
         }
 
         if (ret == JFFS2_COMPR_NONE) {
@@ -277,7 +280,8 @@ int jffs2_decompress(struct jffs2_sb_info *c, struct jffs2_inode_info *f,
                                 ret = this->decompress(cdata_in, data_out, cdatalen, datalen);
                                 spin_lock(&jffs2_compressor_list_lock);
                                 if (ret) {
-                                        printk(KERN_WARNING "Decompressor \"%s\" returned %d\n", this->name, ret);
+                                        pr_warn("Decompressor \"%s\" returned %d\n",
+                                                this->name, ret);
                                 }
                                 else {
                                         this->stat_decompr_blocks++;
@@ -287,7 +291,7 @@ int jffs2_decompress(struct jffs2_sb_info *c, struct jffs2_inode_info *f,
                                 return ret;
                         }
                 }
-                printk(KERN_WARNING "JFFS2 compression type 0x%02x not available.\n", comprtype);
+                pr_warn("compression type 0x%02x not available\n", comprtype);
                 spin_unlock(&jffs2_compressor_list_lock);
                 return -EIO;
         }
@@ -299,7 +303,7 @@ int jffs2_register_compressor(struct jffs2_compressor *comp)
         struct jffs2_compressor *this;
 
         if (!comp->name) {
-                printk(KERN_WARNING "NULL compressor name at registering JFFS2 compressor. Failed.\n");
+                pr_warn("NULL compressor name at registering JFFS2 compressor. Failed.\n");
                 return -1;
         }
         comp->compr_buf_size=0;
@@ -309,7 +313,7 @@ int jffs2_register_compressor(struct jffs2_compressor *comp)
         comp->stat_compr_new_size=0;
         comp->stat_compr_blocks=0;
         comp->stat_decompr_blocks=0;
-        D1(printk(KERN_DEBUG "Registering JFFS2 compressor \"%s\"\n", comp->name));
+        jffs2_dbg(1, "Registering JFFS2 compressor \"%s\"\n", comp->name);
 
         spin_lock(&jffs2_compressor_list_lock);
 
@@ -332,15 +336,15 @@ out:
 
 int jffs2_unregister_compressor(struct jffs2_compressor *comp)
 {
-        D2(struct jffs2_compressor *this;)
+        D2(struct jffs2_compressor *this);
 
-        D1(printk(KERN_DEBUG "Unregistering JFFS2 compressor \"%s\"\n", comp->name));
+        jffs2_dbg(1, "Unregistering JFFS2 compressor \"%s\"\n", comp->name);
 
         spin_lock(&jffs2_compressor_list_lock);
 
         if (comp->usecount) {
                 spin_unlock(&jffs2_compressor_list_lock);
-                printk(KERN_WARNING "JFFS2: Compressor module is in use. Unregister failed.\n");
+                pr_warn("Compressor module is in use. Unregister failed.\n");
                 return -1;
         }
         list_del(&comp->list);
@@ -377,17 +381,17 @@ int __init jffs2_compressors_init(void)
 /* Setting default compression mode */
 #ifdef CONFIG_JFFS2_CMODE_NONE
         jffs2_compression_mode = JFFS2_COMPR_MODE_NONE;
-        D1(printk(KERN_INFO "JFFS2: default compression mode: none\n");)
+        jffs2_dbg(1, "default compression mode: none\n");
 #else
 #ifdef CONFIG_JFFS2_CMODE_SIZE
         jffs2_compression_mode = JFFS2_COMPR_MODE_SIZE;
-        D1(printk(KERN_INFO "JFFS2: default compression mode: size\n");)
+        jffs2_dbg(1, "default compression mode: size\n");
 #else
 #ifdef CONFIG_JFFS2_CMODE_FAVOURLZO
         jffs2_compression_mode = JFFS2_COMPR_MODE_FAVOURLZO;
-        D1(printk(KERN_INFO "JFFS2: default compression mode: favourlzo\n");)
+        jffs2_dbg(1, "default compression mode: favourlzo\n");
 #else
-        D1(printk(KERN_INFO "JFFS2: default compression mode: priority\n");)
+        jffs2_dbg(1, "default compression mode: priority\n");
 #endif
 #endif
 #endif