TOMOYO: Remove __func__ from tomoyo_is_correct_path/domain

__func__ is used for only debug printk(). We can remove it.

Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Signed-off-by: James Morris <jmorris@namei.org>

1 files changed, 5 insertions, 5 deletions

diff --git a/security/tomoyo/file.c b/security/tomoyo/file.c
index db342ef87af7..1b24304edb7d 100644
--- a/security/tomoyo/file.c
+++ b/security/tomoyo/file.c
@@ -168,7 +168,7 @@ static int tomoyo_update_globally_readable_entry(const char *filename,
         const struct tomoyo_path_info *saved_filename;
         int error = is_delete ? -ENOENT : -ENOMEM;
 
-        if (!tomoyo_is_correct_path(filename, 1, 0, -1, __func__))
+        if (!tomoyo_is_correct_path(filename, 1, 0, -1))
                 return -EINVAL;
         saved_filename = tomoyo_get_name(filename);
         if (!saved_filename)
@@ -468,7 +468,7 @@ static int tomoyo_update_no_rewrite_entry(const char *pattern,
         const struct tomoyo_path_info *saved_pattern;
         int error = is_delete ? -ENOENT : -ENOMEM;
 
-        if (!tomoyo_is_correct_path(pattern, 0, 0, 0, __func__))
+        if (!tomoyo_is_correct_path(pattern, 0, 0, 0))
                 return -EINVAL;
         saved_pattern = tomoyo_get_name(pattern);
         if (!saved_pattern)
@@ -814,7 +814,7 @@ static int tomoyo_update_path_acl(const u8 type, const char *filename,
 
         if (!domain)
                 return -EINVAL;
-        if (!tomoyo_is_correct_path(filename, 0, 0, 0, __func__))
+        if (!tomoyo_is_correct_path(filename, 0, 0, 0))
                 return -EINVAL;
         saved_filename = tomoyo_get_name(filename);
         if (!saved_filename)
@@ -898,8 +898,8 @@ static int tomoyo_update_path2_acl(const u8 type, const char *filename1,
 
         if (!domain)
                 return -EINVAL;
-        if (!tomoyo_is_correct_path(filename1, 0, 0, 0, __func__) ||
-            !tomoyo_is_correct_path(filename2, 0, 0, 0, __func__))
+        if (!tomoyo_is_correct_path(filename1, 0, 0, 0) ||
+            !tomoyo_is_correct_path(filename2, 0, 0, 0))
                 return -EINVAL;
         saved_filename1 = tomoyo_get_name(filename1);
         saved_filename2 = tomoyo_get_name(filename2);