diff options
| author | Joe Perches <joe@perches.com> | 2012-02-16 00:56:44 +0100 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2012-03-27 01:39:40 +0200 |
| commit | da320f055a8818269c008e30b887cdcf09d8e4bd (patch) | |
| tree | deaead9c0bd0ed473e633fca2d66460b3b0ec99d /fs/jffs2/super.c | |
| parent | jffs2: Convert most D1/D2 macros to jffs2_dbg (diff) | |
| download | linux-da320f055a8818269c008e30b887cdcf09d8e4bd.tar.xz linux-da320f055a8818269c008e30b887cdcf09d8e4bd.zip | |
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/super.c')
| -rw-r--r-- | fs/jffs2/super.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/fs/jffs2/super.c b/fs/jffs2/super.c index 3600e3e508e5..9e3ba7f0a893 100644 --- a/fs/jffs2/super.c +++ b/fs/jffs2/super.c @@ -214,8 +214,8 @@ static int jffs2_parse_options(struct jffs2_sb_info *c, char *data) JFFS2_COMPR_MODE_FORCEZLIB; #endif else { - printk(KERN_ERR "JFFS2 Error: unknown compressor \"%s\"", - name); + pr_err("JFFS2 Error: unknown compressor \"%s\"", + name); kfree(name); return -EINVAL; } @@ -223,8 +223,8 @@ static int jffs2_parse_options(struct jffs2_sb_info *c, char *data) c->mount_opts.override_compr = true; break; default: - printk(KERN_ERR "JFFS2 Error: unrecognized mount option '%s' or missing value\n", - p); + pr_err("JFFS2 Error: unrecognized mount option '%s' or missing value\n", + p); return -EINVAL; } } @@ -371,7 +371,7 @@ static int __init init_jffs2_fs(void) BUILD_BUG_ON(sizeof(struct jffs2_raw_inode) != 68); BUILD_BUG_ON(sizeof(struct jffs2_raw_summary) != 32); - printk(KERN_INFO "JFFS2 version 2.2." + pr_info("JFFS2 version 2.2." #ifdef CONFIG_JFFS2_FS_WRITEBUFFER " (NAND)" #endif @@ -386,22 +386,22 @@ static int __init init_jffs2_fs(void) SLAB_MEM_SPREAD), jffs2_i_init_once); if (!jffs2_inode_cachep) { - printk(KERN_ERR "JFFS2 error: Failed to initialise inode cache\n"); + pr_err("JFFS2 error: Failed to initialise inode cache\n"); return -ENOMEM; } ret = jffs2_compressors_init(); if (ret) { - printk(KERN_ERR "JFFS2 error: Failed to initialise compressors\n"); + pr_err("JFFS2 error: Failed to initialise compressors\n"); goto out; } ret = jffs2_create_slab_caches(); if (ret) { - printk(KERN_ERR "JFFS2 error: Failed to initialise slab caches\n"); + pr_err("JFFS2 error: Failed to initialise slab caches\n"); goto out_compressors; } ret = register_filesystem(&jffs2_fs_type); if (ret) { - printk(KERN_ERR "JFFS2 error: Failed to register filesystem\n"); + pr_err("JFFS2 error: Failed to register filesystem\n"); goto out_slab; } return 0; |