fs/affs: convert printk to pr_foo()

-All printk(KERN_foo converted to pr_foo()

-Default printk converted to pr_warn()

-Add pr_fmt to affs.h

Signed-off-by: Fabian Frederick <fabf@skynet.be>
Cc: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 6 insertions, 7 deletions

diff --git a/fs/affs/bitmap.c b/fs/affs/bitmap.c
index a32246b8359e..d9559f5d2d1b 100644
--- a/fs/affs/bitmap.c
+++ b/fs/affs/bitmap.c
@@ -254,8 +254,7 @@ int affs_init_bitmap(struct super_block *sb, int *flags)
                 return 0;
 
         if (!AFFS_ROOT_TAIL(sb, sbi->s_root_bh)->bm_flag) {
-                printk(KERN_NOTICE "AFFS: Bitmap invalid - mounting %s read only\n",
-                        sb->s_id);
+                pr_notice("Bitmap invalid - mounting %s read only\n", sb->s_id);
                 *flags |= MS_RDONLY;
                 return 0;
         }
@@ -268,7 +267,7 @@ int affs_init_bitmap(struct super_block *sb, int *flags)
         size = sbi->s_bmap_count * sizeof(*bm);
         bm = sbi->s_bitmap = kzalloc(size, GFP_KERNEL);
         if (!sbi->s_bitmap) {
-                printk(KERN_ERR "AFFS: Bitmap allocation failed\n");
+                pr_err("Bitmap allocation failed\n");
                 return -ENOMEM;
         }
 
@@ -282,13 +281,13 @@ int affs_init_bitmap(struct super_block *sb, int *flags)
                 bm->bm_key = be32_to_cpu(bmap_blk[blk]);
                 bh = affs_bread(sb, bm->bm_key);
                 if (!bh) {
-                        printk(KERN_ERR "AFFS: Cannot read bitmap\n");
+                        pr_err("Cannot read bitmap\n");
                         res = -EIO;
                         goto out;
                 }
                 if (affs_checksum_block(sb, bh)) {
-                        printk(KERN_WARNING "AFFS: Bitmap %u invalid - mounting %s read only.\n",
-                               bm->bm_key, sb->s_id);
+                        pr_warn("Bitmap %u invalid - mounting %s read only.\n",
+                                bm->bm_key, sb->s_id);
                         *flags |= MS_RDONLY;
                         goto out;
                 }
@@ -304,7 +303,7 @@ int affs_init_bitmap(struct super_block *sb, int *flags)
                         affs_brelse(bmap_bh);
                 bmap_bh = affs_bread(sb, be32_to_cpu(bmap_blk[blk]));
                 if (!bmap_bh) {
-                        printk(KERN_ERR "AFFS: Cannot read bitmap extension\n");
+                        pr_err("Cannot read bitmap extension\n");
                         res = -EIO;
                         goto out;
                 }