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, 9 insertions, 9 deletions

diff --git a/security/tomoyo/domain.c b/security/tomoyo/domain.c
index 74cd0f52e3a8..66caaa1b842a 100644
--- a/security/tomoyo/domain.c
+++ b/security/tomoyo/domain.c
@@ -136,13 +136,13 @@ static int tomoyo_update_domain_initializer_entry(const char *domainname,
         int error = is_delete ? -ENOENT : -ENOMEM;
         bool is_last_name = false;
 
-        if (!tomoyo_is_correct_path(program, 1, -1, -1, __func__))
+        if (!tomoyo_is_correct_path(program, 1, -1, -1))
                 return -EINVAL; /* No patterns allowed. */
         if (domainname) {
                 if (!tomoyo_is_domain_def(domainname) &&
-                    tomoyo_is_correct_path(domainname, 1, -1, -1, __func__))
+                    tomoyo_is_correct_path(domainname, 1, -1, -1))
                         is_last_name = true;
-                else if (!tomoyo_is_correct_domain(domainname, __func__))
+                else if (!tomoyo_is_correct_domain(domainname))
                         return -EINVAL;
                 saved_domainname = tomoyo_get_name(domainname);
                 if (!saved_domainname)
@@ -357,12 +357,12 @@ static int tomoyo_update_domain_keeper_entry(const char *domainname,
         bool is_last_name = false;
 
         if (!tomoyo_is_domain_def(domainname) &&
-            tomoyo_is_correct_path(domainname, 1, -1, -1, __func__))
+            tomoyo_is_correct_path(domainname, 1, -1, -1))
                 is_last_name = true;
-        else if (!tomoyo_is_correct_domain(domainname, __func__))
+        else if (!tomoyo_is_correct_domain(domainname))
                 return -EINVAL;
         if (program) {
-                if (!tomoyo_is_correct_path(program, 1, -1, -1, __func__))
+                if (!tomoyo_is_correct_path(program, 1, -1, -1))
                         return -EINVAL;
                 saved_program = tomoyo_get_name(program);
                 if (!saved_program)
@@ -556,8 +556,8 @@ static int tomoyo_update_alias_entry(const char *original_name,
         const struct tomoyo_path_info *saved_aliased_name;
         int error = is_delete ? -ENOENT : -ENOMEM;
 
-        if (!tomoyo_is_correct_path(original_name, 1, -1, -1, __func__) ||
-            !tomoyo_is_correct_path(aliased_name, 1, -1, -1, __func__))
+        if (!tomoyo_is_correct_path(original_name, 1, -1, -1) ||
+            !tomoyo_is_correct_path(aliased_name, 1, -1, -1))
                 return -EINVAL; /* No patterns allowed. */
         saved_original_name = tomoyo_get_name(original_name);
         saved_aliased_name = tomoyo_get_name(aliased_name);
@@ -659,7 +659,7 @@ struct tomoyo_domain_info *tomoyo_find_or_assign_new_domain(const char *
         const struct tomoyo_path_info *saved_domainname;
         bool found = false;
 
-        if (!tomoyo_is_correct_domain(domainname, __func__))
+        if (!tomoyo_is_correct_domain(domainname))
                 return NULL;
         saved_domainname = tomoyo_get_name(domainname);
         if (!saved_domainname)