tracing: Rename ftrace_output functions to trace_output

The name "ftrace" really refers to the function hook infrastructure. It
is not about the trace_events. The ftrace_output_*() and ftrace_raw_output_*()
functions represent the trace_event code. Rename them to just trace_output
or trace_raw_output.

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

4 files changed, 20 insertions, 20 deletions

diff --git a/include/linux/trace_events.h b/include/linux/trace_events.h
index a1fa8ebaf684..12ca46322a94 100644
--- a/include/linux/trace_events.h
+++ b/include/linux/trace_events.h
@@ -52,8 +52,8 @@ const char *trace_print_array_seq(struct trace_seq *p,
 struct trace_iterator;
 struct trace_event;
 
-int ftrace_raw_output_prep(struct trace_iterator *iter,
-                           struct trace_event *event);
+int trace_raw_output_prep(struct trace_iterator *iter,
+                          struct trace_event *event);
 
 /*
  * The trace entry - the most basic unit of tracing. This is what
@@ -183,7 +183,7 @@ void trace_current_buffer_discard_commit(struct ring_buffer *buffer,
 
 void tracing_record_cmdline(struct task_struct *tsk);
 
-int ftrace_output_call(struct trace_iterator *iter, char *name, char *fmt, ...);
+int trace_output_call(struct trace_iterator *iter, char *name, char *fmt, ...);
 
 struct event_filter;
 
diff --git a/include/trace/perf.h b/include/trace/perf.h
index b1d7399df449..0dbdbfe0ec41 100644
--- a/include/trace/perf.h
+++ b/include/trace/perf.h
@@ -58,7 +58,7 @@
  * }
  *
  * static struct trace_event ftrace_event_type_<call> = {
- *      .trace                  = ftrace_raw_output_<call>, <-- stage 2
+ *      .trace                  = trace_raw_output_<call>, <-- stage 2
  * };
  *
  * static char print_fmt_<call>[] = <TP_printk>;
diff --git a/include/trace/trace_events.h b/include/trace/trace_events.h
index c6f826136b8c..ab927dd32149 100644
--- a/include/trace/trace_events.h
+++ b/include/trace/trace_events.h
@@ -203,7 +203,7 @@ TRACE_MAKE_SYSTEM_STR();
  * Override the macros in <trace/trace_events.h> to include the following:
  *
  * enum print_line_t
- * ftrace_raw_output_<call>(struct trace_iterator *iter, int flags)
+ * trace_raw_output_<call>(struct trace_iterator *iter, int flags)
  * {
  *      struct trace_seq *s = &iter->seq;
  *      struct ftrace_raw_<call> *field; <-- defined in stage 1
@@ -304,8 +304,8 @@ TRACE_MAKE_SYSTEM_STR();
 #undef DECLARE_EVENT_CLASS
 #define DECLARE_EVENT_CLASS(call, proto, args, tstruct, assign, print)  \
 static notrace enum print_line_t                                        \
-ftrace_raw_output_##call(struct trace_iterator *iter, int flags,        \
-                         struct trace_event *trace_event)               \
+trace_raw_output_##call(struct trace_iterator *iter, int flags,         \
+                        struct trace_event *trace_event)                \
 {                                                                       \
         struct trace_seq *s = &iter->seq;                               \
         struct trace_seq __maybe_unused *p = &iter->tmp_seq;            \
@@ -314,7 +314,7 @@ ftrace_raw_output_##call(struct trace_iterator *iter, int flags,	\
                                                                         \
         field = (typeof(field))iter->ent;                               \
                                                                         \
-        ret = ftrace_raw_output_prep(iter, trace_event);                \
+        ret = trace_raw_output_prep(iter, trace_event);                 \
         if (ret != TRACE_TYPE_HANDLED)                                  \
                 return ret;                                             \
                                                                         \
@@ -323,13 +323,13 @@ ftrace_raw_output_##call(struct trace_iterator *iter, int flags,	\
         return trace_handle_return(s);                                  \
 }                                                                       \
 static struct trace_event_functions ftrace_event_type_funcs_##call = {  \
-        .trace                  = ftrace_raw_output_##call,             \
+        .trace                  = trace_raw_output_##call,              \
 };
 
 #undef DEFINE_EVENT_PRINT
 #define DEFINE_EVENT_PRINT(template, call, proto, args, print)          \
 static notrace enum print_line_t                                        \
-ftrace_raw_output_##call(struct trace_iterator *iter, int flags,        \
+trace_raw_output_##call(struct trace_iterator *iter, int flags,         \
                          struct trace_event *event)                     \
 {                                                                       \
         struct ftrace_raw_##template *field;                            \
@@ -346,10 +346,10 @@ ftrace_raw_output_##call(struct trace_iterator *iter, int flags,	\
         field = (typeof(field))entry;                                   \
                                                                         \
         trace_seq_init(p);                                              \
-        return ftrace_output_call(iter, #call, print);                  \
+        return trace_output_call(iter, #call, print);                   \
 }                                                                       \
 static struct trace_event_functions ftrace_event_type_funcs_##call = {  \
-        .trace                  = ftrace_raw_output_##call,             \
+        .trace                  = trace_raw_output_##call,              \
 };
 
 #include TRACE_INCLUDE(TRACE_INCLUDE_FILE)
diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
index 21c6525efcef..d1a2feb54d06 100644
--- a/kernel/trace/trace_output.c
+++ b/kernel/trace/trace_output.c
@@ -222,8 +222,8 @@ trace_print_array_seq(struct trace_seq *p, const void *buf, int count,
 }
 EXPORT_SYMBOL(trace_print_array_seq);
 
-int ftrace_raw_output_prep(struct trace_iterator *iter,
-                           struct trace_event *trace_event)
+int trace_raw_output_prep(struct trace_iterator *iter,
+                          struct trace_event *trace_event)
 {
         struct trace_event_call *event;
         struct trace_seq *s = &iter->seq;
@@ -243,10 +243,10 @@ int ftrace_raw_output_prep(struct trace_iterator *iter,
 
         return trace_handle_return(s);
 }
-EXPORT_SYMBOL(ftrace_raw_output_prep);
+EXPORT_SYMBOL(trace_raw_output_prep);
 
-static int ftrace_output_raw(struct trace_iterator *iter, char *name,
-                             char *fmt, va_list ap)
+static int trace_output_raw(struct trace_iterator *iter, char *name,
+                            char *fmt, va_list ap)
 {
         struct trace_seq *s = &iter->seq;
 
@@ -256,18 +256,18 @@ static int ftrace_output_raw(struct trace_iterator *iter, char *name,
         return trace_handle_return(s);
 }
 
-int ftrace_output_call(struct trace_iterator *iter, char *name, char *fmt, ...)
+int trace_output_call(struct trace_iterator *iter, char *name, char *fmt, ...)
 {
         va_list ap;
         int ret;
 
         va_start(ap, fmt);
-        ret = ftrace_output_raw(iter, name, fmt, ap);
+        ret = trace_output_raw(iter, name, fmt, ap);
         va_end(ap);
 
         return ret;
 }
-EXPORT_SYMBOL_GPL(ftrace_output_call);
+EXPORT_SYMBOL_GPL(trace_output_call);
 
 #ifdef CONFIG_KRETPROBES
 static inline const char *kretprobed(const char *name)