fs/romfs/super.c: convert printk to pr_foo()

Use current logging functions. Coalesce formats.

Signed-off-by: Fabian Frederick <fabf@skynet.be>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 7 insertions, 9 deletions

diff --git a/fs/romfs/super.c b/fs/romfs/super.c
index ef90e8bca95a..c32006ea3d88 100644
--- a/fs/romfs/super.c
+++ b/fs/romfs/super.c
@@ -380,7 +380,7 @@ static struct inode *romfs_iget(struct super_block *sb, unsigned long pos)
 eio:
         ret = -EIO;
 error:
-        printk(KERN_ERR "ROMFS: read error for inode 0x%lx\n", pos);
+        pr_err("ROMFS: read error for inode 0x%lx\n", pos);
         return ERR_PTR(ret);
 }
 
@@ -507,14 +507,13 @@ static int romfs_fill_super(struct super_block *sb, void *data, int silent)
         if (rsb->word0 != ROMSB_WORD0 || rsb->word1 != ROMSB_WORD1 ||
             img_size < ROMFH_SIZE) {
                 if (!silent)
-                        printk(KERN_WARNING "VFS:"
-                               " Can't find a romfs filesystem on dev %s.\n",
+                        pr_warn("VFS: Can't find a romfs filesystem on dev %s.\n",
                                sb->s_id);
                 goto error_rsb_inval;
         }
 
         if (romfs_checksum(rsb, min_t(size_t, img_size, 512))) {
-                printk(KERN_ERR "ROMFS: bad initial checksum on dev %s.\n",
+                pr_err("ROMFS: bad initial checksum on dev %s.\n",
                        sb->s_id);
                 goto error_rsb_inval;
         }
@@ -523,7 +522,7 @@ static int romfs_fill_super(struct super_block *sb, void *data, int silent)
 
         len = strnlen(rsb->name, ROMFS_MAXFN);
         if (!silent)
-                printk(KERN_NOTICE "ROMFS: Mounting image '%*.*s' through %s\n",
+                pr_notice("ROMFS: Mounting image '%*.*s' through %s\n",
                        (unsigned) len, (unsigned) len, rsb->name, storage);
 
         kfree(rsb);
@@ -614,7 +613,7 @@ static int __init init_romfs_fs(void)
 {
         int ret;
 
-        printk(KERN_INFO "ROMFS MTD (C) 2007 Red Hat, Inc.\n");
+        pr_info("ROMFS MTD (C) 2007 Red Hat, Inc.\n");
 
         romfs_inode_cachep =
                 kmem_cache_create("romfs_i",
@@ -623,13 +622,12 @@ static int __init init_romfs_fs(void)
                                   romfs_i_init_once);
 
         if (!romfs_inode_cachep) {
-                printk(KERN_ERR
-                       "ROMFS error: Failed to initialise inode cache\n");
+                pr_err("ROMFS error: Failed to initialise inode cache\n");
                 return -ENOMEM;
         }
         ret = register_filesystem(&romfs_fs_type);
         if (ret) {
-                printk(KERN_ERR "ROMFS error: Failed to register filesystem\n");
+                pr_err("ROMFS error: Failed to register filesystem\n");
                 goto error_register;
         }
         return 0;