Merge branch 'for-v3.16/ti-clk-drv' of github.com:t-kristo/linux-pm into clk-next

[firefly-linux-kernel-4.4.55.git] / fs / efs / namei.c

diff --git a/fs/efs/namei.c b/fs/efs/namei.c
index 527d0b914915c0dc0afd46891ce3dba3161ee457..356c044e2cd302276f43c19031e74b8f678de35b 100644 (file)
--- a/fs/efs/namei.c
+++ b/fs/efs/namei.c
@@ -23,20 +23,22 @@ static efs_ino_t efs_find_entry(struct inode *inode, const char *name, int len)
        efs_block_t             block;
  
        if (inode->i_size & (EFS_DIRBSIZE-1))
-               pr_warn("EFS: WARNING: find_entry(): directory size not a multiple of EFS_DIRBSIZE\n");
+               pr_warn("%s(): directory size not a multiple of EFS_DIRBSIZE\n",
+                       __func__);
 
        for(block = 0; block < inode->i_blocks; block++) {
 
                bh = sb_bread(inode->i_sb, efs_bmap(inode, block));
                if (!bh) {
-                       pr_err("EFS: find_entry(): failed to read dir block %d\n", block);
+                       pr_err("%s(): failed to read dir block %d\n",
+                              __func__, block);
                        return 0;
                }
     
                dirblock = (struct efs_dir *) bh->b_data;
 
                if (be16_to_cpu(dirblock->magic) != EFS_DIRBLK_MAGIC) {
-                       pr_err("EFS: find_entry(): invalid directory block\n");
+                       pr_err("%s(): invalid directory block\n", __func__);
                        brelse(bh);
                        return(0);
                }