Merge tag 'clk-for-linus-3.15' of git://git.linaro.org/people/mike.turquette/linux

[firefly-linux-kernel-4.4.55.git] / fs / befs / io.c

diff --git a/fs/befs/io.c b/fs/befs/io.c
index ddef98aa255dc8001f6e7fdf43169c1591954e9a..0408a3d601d0207f50647f242ae032c0737e0cdc 100644 (file)
--- a/fs/befs/io.c
+++ b/fs/befs/io.c
@@ -30,9 +30,9 @@ befs_bread_iaddr(struct super_block *sb, befs_inode_addr iaddr)
        befs_blocknr_t block = 0;
        befs_sb_info *befs_sb = BEFS_SB(sb);
 
-       befs_debug(sb, "---> Enter befs_read_iaddr() "
-                  "[%u, %hu, %hu]",
-                  iaddr.allocation_group, iaddr.start, iaddr.len);
+       befs_debug(sb, "---> Enter %s "
+                  "[%u, %hu, %hu]", __func__, iaddr.allocation_group,
+                  iaddr.start, iaddr.len);
 
        if (iaddr.allocation_group > befs_sb->num_ags) {
                befs_error(sb, "BEFS: Invalid allocation group %u, max is %u",
@@ -42,20 +42,21 @@ befs_bread_iaddr(struct super_block *sb, befs_inode_addr iaddr)
 
        block = iaddr2blockno(sb, &iaddr);
 
-       befs_debug(sb, "befs_read_iaddr: offset = %lu", block);
+       befs_debug(sb, "%s: offset = %lu", __func__, (unsigned long)block);
 
        bh = sb_bread(sb, block);
 
        if (bh == NULL) {
-               befs_error(sb, "Failed to read block %lu", block);
+               befs_error(sb, "Failed to read block %lu",
+                          (unsigned long)block);
                goto error;
        }
 
-       befs_debug(sb, "<--- befs_read_iaddr()");
+       befs_debug(sb, "<--- %s", __func__);
        return bh;
 
       error:
-       befs_debug(sb, "<--- befs_read_iaddr() ERROR");
+       befs_debug(sb, "<--- %s ERROR", __func__);
        return NULL;
 }
 
@@ -64,20 +65,21 @@ befs_bread(struct super_block *sb, befs_blocknr_t block)
 {
        struct buffer_head *bh = NULL;
 
-       befs_debug(sb, "---> Enter befs_read() %Lu", block);
+       befs_debug(sb, "---> Enter %s %lu", __func__, (unsigned long)block);
 
        bh = sb_bread(sb, block);
 
        if (bh == NULL) {
-               befs_error(sb, "Failed to read block %lu", block);
+               befs_error(sb, "Failed to read block %lu",
+                          (unsigned long)block);
                goto error;
        }
 
-       befs_debug(sb, "<--- befs_read()");
+       befs_debug(sb, "<--- %s", __func__);
 
        return bh;
 
       error:
-       befs_debug(sb, "<--- befs_read() ERROR");
+       befs_debug(sb, "<--- %s ERROR", __func__);
        return NULL;
 }