ftrace: Remove unused unregister_ftrace_function_probe() function

Nothing calls unregister_ftrace_function_probe(). Remove it as well as the
flag PROBE_TEST_DATA, as this function was the only one to set it.

Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>

diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index ac47d1845fdb4e42ef0c2fb419bf508a5048f39b..5448089e6028fb9950c3cb04e4830f45a495b802 100644 (file)
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -4061,12 +4061,11 @@ register_ftrace_function_probe(char *glob, struct ftrace_probe_ops *ops,
 
 enum {
        PROBE_TEST_FUNC         = 1,
-       PROBE_TEST_DATA         = 2
 };
 
 static void
 __unregister_ftrace_function_probe(char *glob, struct ftrace_probe_ops *ops,
-                                 void *data, int flags)
+                                  int flags)
 {
        struct ftrace_ops_hash old_hash_ops;
        struct ftrace_func_entry *rec_entry;
@@ -4119,9 +4118,6 @@ __unregister_ftrace_function_probe(char *glob, struct ftrace_probe_ops *ops,
                        if ((flags & PROBE_TEST_FUNC) && entry->ops != ops)
                                continue;
 
-                       if ((flags & PROBE_TEST_DATA) && entry->data != data)
-                               continue;
-
                        /* do this last, since it is the most expensive */
                        if (func_g.search) {
                                kallsyms_lookup(entry->ip, NULL, NULL,
@@ -4166,23 +4162,15 @@ __unregister_ftrace_function_probe(char *glob, struct ftrace_probe_ops *ops,
        free_ftrace_hash(hash);
 }
 
-void
-unregister_ftrace_function_probe(char *glob, struct ftrace_probe_ops *ops,
-                               void *data)
-{
-       __unregister_ftrace_function_probe(glob, ops, data,
-                                         PROBE_TEST_FUNC | PROBE_TEST_DATA);
-}
-
 void
 unregister_ftrace_function_probe_func(char *glob, struct ftrace_probe_ops *ops)
 {
-       __unregister_ftrace_function_probe(glob, ops, NULL, PROBE_TEST_FUNC);
+       __unregister_ftrace_function_probe(glob, ops, PROBE_TEST_FUNC);
 }
 
 void unregister_ftrace_function_probe_all(char *glob)
 {
-       __unregister_ftrace_function_probe(glob, NULL, NULL, 0);
+       __unregister_ftrace_function_probe(glob, NULL, 0);
 }
 
 static LIST_HEAD(ftrace_commands);

diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
index dbbdee21bcc404291af67752ebc27e86d7002477..507a62e9192ef31618f7cffca7c20fc3602ec077 100644 (file)
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@ -964,9 +964,6 @@ extern int
 register_ftrace_function_probe(char *glob, struct ftrace_probe_ops *ops,
                              void *data);
 extern void
-unregister_ftrace_function_probe(char *glob, struct ftrace_probe_ops *ops,
-                               void *data);
-extern void
 unregister_ftrace_function_probe_func(char *glob, struct ftrace_probe_ops *ops);
 extern void unregister_ftrace_function_probe_all(char *glob);