aboutsummaryrefslogtreecommitdiffstats
path: root/fs/jffs2/compr_zlib.c
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2012-02-15 18:56:44 -0500
committerDavid Woodhouse <David.Woodhouse@intel.com>2012-03-26 19:39:40 -0400
commitda320f055a8818269c008e30b887cdcf09d8e4bd (patch)
treedeaead9c0bd0ed473e633fca2d66460b3b0ec99d /fs/jffs2/compr_zlib.c
parent9c261b33a9c417ccaf07f41796be278d09d02d49 (diff)
jffs2: Convert printks to pr_<level>
Use the more current logging style. Coalesce formats, align arguments. Convert uses of embedded function names to %s, __func__. A couple of long line checkpatch errors I don't care about exist. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'fs/jffs2/compr_zlib.c')
-rw-r--r--fs/jffs2/compr_zlib.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/jffs2/compr_zlib.c b/fs/jffs2/compr_zlib.c
index 40979c928751..88529e4924c6 100644
--- a/fs/jffs2/compr_zlib.c
+++ b/fs/jffs2/compr_zlib.c
@@ -79,7 +79,7 @@ static int jffs2_zlib_compress(unsigned char *data_in,
79 mutex_lock(&deflate_mutex); 79 mutex_lock(&deflate_mutex);
80 80
81 if (Z_OK != zlib_deflateInit(&def_strm, 3)) { 81 if (Z_OK != zlib_deflateInit(&def_strm, 3)) {
82 printk(KERN_WARNING "deflateInit failed\n"); 82 pr_warn("deflateInit failed\n");
83 mutex_unlock(&deflate_mutex); 83 mutex_unlock(&deflate_mutex);
84 return -1; 84 return -1;
85 } 85 }
@@ -169,7 +169,7 @@ static int jffs2_zlib_decompress(unsigned char *data_in,
169 169
170 170
171 if (Z_OK != zlib_inflateInit2(&inf_strm, wbits)) { 171 if (Z_OK != zlib_inflateInit2(&inf_strm, wbits)) {
172 printk(KERN_WARNING "inflateInit failed\n"); 172 pr_warn("inflateInit failed\n");
173 mutex_unlock(&inflate_mutex); 173 mutex_unlock(&inflate_mutex);
174 return 1; 174 return 1;
175 } 175 }
@@ -177,7 +177,7 @@ static int jffs2_zlib_decompress(unsigned char *data_in,
177 while((ret = zlib_inflate(&inf_strm, Z_FINISH)) == Z_OK) 177 while((ret = zlib_inflate(&inf_strm, Z_FINISH)) == Z_OK)
178 ; 178 ;
179 if (ret != Z_STREAM_END) { 179 if (ret != Z_STREAM_END) {
180 printk(KERN_NOTICE "inflate returned %d\n", ret); 180 pr_notice("inflate returned %d\n", ret);
181 } 181 }
182 zlib_inflateEnd(&inf_strm); 182 zlib_inflateEnd(&inf_strm);
183 mutex_unlock(&inflate_mutex); 183 mutex_unlock(&inflate_mutex);