fs/efs: convert printk(KERN_DEBUG to pr_debug

All KERN_DEBUG callsites being under #ifdef DEBUG we can safely convert
everything to pr_debug without changing current behaviour.

Remove #ifdef DEBUG around pr_debugs only (suggested by Joe Perches)

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, 8 insertions, 10 deletions

diff --git a/fs/efs/super.c b/fs/efs/super.c
index cd1399e5fc83..7fca462ea4e3 100644
--- a/fs/efs/super.c
+++ b/fs/efs/super.c
@@ -184,7 +184,7 @@ static efs_block_t efs_validate_vh(struct volume_header *vh) {
         }
 
 #ifdef DEBUG
-        printk(KERN_DEBUG "EFS: bf: \"%16s\"\n", vh->vh_bootfile);
+        pr_debug("bf: \"%16s\"\n", vh->vh_bootfile);
 
         for(i = 0; i < NVDIR; i++) {
                 int     j;
@@ -196,9 +196,8 @@ static efs_block_t efs_validate_vh(struct volume_header *vh) {
                 name[j] = (char) 0;
 
                 if (name[0]) {
-                        printk(KERN_DEBUG "EFS: vh: %8s block: 0x%08x size: 0x%08x\n",
-                                name,
-                                (int) be32_to_cpu(vh->vh_vd[i].vd_lbn),
+                        pr_debug("vh: %8s block: 0x%08x size: 0x%08x\n",
+                                name, (int) be32_to_cpu(vh->vh_vd[i].vd_lbn),
                                 (int) be32_to_cpu(vh->vh_vd[i].vd_nbytes));
                 }
         }
@@ -211,12 +210,11 @@ static efs_block_t efs_validate_vh(struct volume_header *vh) {
                 }
 #ifdef DEBUG
                 if (be32_to_cpu(vh->vh_pt[i].pt_nblks)) {
-                        printk(KERN_DEBUG "EFS: pt %2d: start: %08d size: %08d type: 0x%02x (%s)\n",
-                                i,
-                                (int) be32_to_cpu(vh->vh_pt[i].pt_firstlbn),
-                                (int) be32_to_cpu(vh->vh_pt[i].pt_nblks),
-                                pt_type,
-                                (pt_entry->pt_name) ? pt_entry->pt_name : "unknown");
+                        pr_debug("pt %2d: start: %08d size: %08d type: 0x%02x (%s)\n",
+                                 i, (int)be32_to_cpu(vh->vh_pt[i].pt_firstlbn),
+                                 (int)be32_to_cpu(vh->vh_pt[i].pt_nblks),
+                                 pt_type, (pt_entry->pt_name) ?
+                                 pt_entry->pt_name : "unknown");
                 }
 #endif
                 if (IS_EFS(pt_type)) {