tracing: replace TP<var> with TP_<var>

Impact: clean up

The macros TPPROTO, TPARGS, TPFMT, TPRAWFMT, and TPCMD all look a bit
ugly. This patch adds an underscore to their names.

Signed-off-by: Steven Rostedt <srostedt@redhat.com>

5 files changed, 25 insertions, 80 deletions

diff --git a/kernel/trace/trace_event_types.h b/kernel/trace/trace_event_types.h
index fb4eba166433..d94179aa1fc2 100644
--- a/kernel/trace/trace_event_types.h
+++ b/kernel/trace/trace_event_types.h
@@ -10,7 +10,7 @@ TRACE_EVENT_FORMAT(function, TRACE_FN, ftrace_entry, ignore,
                 TRACE_FIELD(unsigned long, ip, ip)
                 TRACE_FIELD(unsigned long, parent_ip, parent_ip)
         ),
-        TPRAWFMT(" %lx <-- %lx")
+        TP_RAW_FMT(" %lx <-- %lx")
 );
 
 TRACE_EVENT_FORMAT(funcgraph_entry, TRACE_GRAPH_ENT,
@@ -19,7 +19,7 @@ TRACE_EVENT_FORMAT(funcgraph_entry, TRACE_GRAPH_ENT,
                 TRACE_FIELD(unsigned long, graph_ent.func, func)
                 TRACE_FIELD(int, graph_ent.depth, depth)
         ),
-        TPRAWFMT("--> %lx (%d)")
+        TP_RAW_FMT("--> %lx (%d)")
 );
 
 TRACE_EVENT_FORMAT(funcgraph_exit, TRACE_GRAPH_RET,
@@ -28,7 +28,7 @@ TRACE_EVENT_FORMAT(funcgraph_exit, TRACE_GRAPH_RET,
                 TRACE_FIELD(unsigned long, ret.func, func)
                 TRACE_FIELD(int, ret.depth, depth)
         ),
-        TPRAWFMT("<-- %lx (%d)")
+        TP_RAW_FMT("<-- %lx (%d)")
 );
 
 TRACE_EVENT_FORMAT(wakeup, TRACE_WAKE, ctx_switch_entry, ignore,
@@ -41,7 +41,7 @@ TRACE_EVENT_FORMAT(wakeup, TRACE_WAKE, ctx_switch_entry, ignore,
                 TRACE_FIELD(unsigned char, next_state, next_state)
                 TRACE_FIELD(unsigned int, next_cpu, next_cpu)
         ),
-        TPRAWFMT("%u:%u:%u  ==+ %u:%u:%u [%03u]")
+        TP_RAW_FMT("%u:%u:%u  ==+ %u:%u:%u [%03u]")
 );
 
 TRACE_EVENT_FORMAT(context_switch, TRACE_CTX, ctx_switch_entry, ignore,
@@ -54,7 +54,7 @@ TRACE_EVENT_FORMAT(context_switch, TRACE_CTX, ctx_switch_entry, ignore,
                 TRACE_FIELD(unsigned char, next_state, next_state)
                 TRACE_FIELD(unsigned int, next_cpu, next_cpu)
         ),
-        TPRAWFMT("%u:%u:%u  ==+ %u:%u:%u [%03u]")
+        TP_RAW_FMT("%u:%u:%u  ==+ %u:%u:%u [%03u]")
 );
 
 TRACE_EVENT_FORMAT(special, TRACE_SPECIAL, special_entry, ignore,
@@ -63,7 +63,7 @@ TRACE_EVENT_FORMAT(special, TRACE_SPECIAL, special_entry, ignore,
                 TRACE_FIELD(unsigned long, arg2, arg2)
                 TRACE_FIELD(unsigned long, arg3, arg3)
         ),
-        TPRAWFMT("(%08lx) (%08lx) (%08lx)")
+        TP_RAW_FMT("(%08lx) (%08lx) (%08lx)")
 );
 
 /*
@@ -83,7 +83,7 @@ TRACE_EVENT_FORMAT(kernel_stack, TRACE_STACK, stack_entry, ignore,
                 TRACE_FIELD(unsigned long, caller[6], stack6)
                 TRACE_FIELD(unsigned long, caller[7], stack7)
         ),
-        TPRAWFMT("\t=> (%08lx)\n\t=> (%08lx)\n\t=> (%08lx)\n\t=> (%08lx)\n"
+        TP_RAW_FMT("\t=> (%08lx)\n\t=> (%08lx)\n\t=> (%08lx)\n\t=> (%08lx)\n"
                  "\t=> (%08lx)\n\t=> (%08lx)\n\t=> (%08lx)\n\t=> (%08lx)\n")
 );
 
@@ -98,7 +98,7 @@ TRACE_EVENT_FORMAT(user_stack, TRACE_USER_STACK, userstack_entry, ignore,
                 TRACE_FIELD(unsigned long, caller[6], stack6)
                 TRACE_FIELD(unsigned long, caller[7], stack7)
         ),
-        TPRAWFMT("\t=> (%08lx)\n\t=> (%08lx)\n\t=> (%08lx)\n\t=> (%08lx)\n"
+        TP_RAW_FMT("\t=> (%08lx)\n\t=> (%08lx)\n\t=> (%08lx)\n\t=> (%08lx)\n"
                  "\t=> (%08lx)\n\t=> (%08lx)\n\t=> (%08lx)\n\t=> (%08lx)\n")
 );
 
@@ -108,7 +108,7 @@ TRACE_EVENT_FORMAT(print, TRACE_PRINT, print_entry, ignore,
                 TRACE_FIELD(unsigned int, depth, depth)
                 TRACE_FIELD_ZERO_CHAR(buf)
         ),
-        TPRAWFMT("%08lx (%d) %s")
+        TP_RAW_FMT("%08lx (%d) %s")
 );
 
 TRACE_EVENT_FORMAT(branch, TRACE_BRANCH, trace_branch, ignore,
@@ -118,7 +118,7 @@ TRACE_EVENT_FORMAT(branch, TRACE_BRANCH, trace_branch, ignore,
                 TRACE_FIELD_SPECIAL(char file[TRACE_FUNC_SIZE+1], file, file)
                 TRACE_FIELD(char, correct, correct)
         ),
-        TPRAWFMT("%u:%s:%s (%u)")
+        TP_RAW_FMT("%u:%s:%s (%u)")
 );
 
 TRACE_EVENT_FORMAT(hw_branch, TRACE_HW_BRANCHES, hw_branch_entry, ignore,
@@ -126,7 +126,7 @@ TRACE_EVENT_FORMAT(hw_branch, TRACE_HW_BRANCHES, hw_branch_entry, ignore,
                 TRACE_FIELD(u64, from, from)
                 TRACE_FIELD(u64, to, to)
         ),
-        TPRAWFMT("from: %llx to: %llx")
+        TP_RAW_FMT("from: %llx to: %llx")
 );
 
 TRACE_EVENT_FORMAT(power, TRACE_POWER, trace_power, ignore,
@@ -136,7 +136,7 @@ TRACE_EVENT_FORMAT(power, TRACE_POWER, trace_power, ignore,
                 TRACE_FIELD(int, state_data.type, type)
                 TRACE_FIELD(int, state_data.state, state)
         ),
-        TPRAWFMT("%llx->%llx type:%u state:%u")
+        TP_RAW_FMT("%llx->%llx type:%u state:%u")
 );
 
 TRACE_EVENT_FORMAT(kmem_alloc, TRACE_KMEM_ALLOC, kmemtrace_alloc_entry, ignore,
@@ -149,7 +149,7 @@ TRACE_EVENT_FORMAT(kmem_alloc, TRACE_KMEM_ALLOC, kmemtrace_alloc_entry, ignore,
                 TRACE_FIELD(gfp_t, gfp_flags, gfp_flags)
                 TRACE_FIELD(int, node, node)
         ),
-        TPRAWFMT("type:%u call_site:%lx ptr:%p req:%lu alloc:%lu"
+        TP_RAW_FMT("type:%u call_site:%lx ptr:%p req:%lu alloc:%lu"
                  " flags:%x node:%d")
 );
 
@@ -159,7 +159,7 @@ TRACE_EVENT_FORMAT(kmem_free, TRACE_KMEM_FREE, kmemtrace_free_entry, ignore,
                 TRACE_FIELD(unsigned long, call_site, call_site)
                 TRACE_FIELD(const void *, ptr, ptr)
         ),
-        TPRAWFMT("type:%u call_site:%lx ptr:%p")
+        TP_RAW_FMT("type:%u call_site:%lx ptr:%p")
 );
 
 #undef TRACE_SYSTEM
diff --git a/kernel/trace/trace_events_stage_2.h b/kernel/trace/trace_events_stage_2.h
index d24a97e74aea..8e2e0f56c2a8 100644
--- a/kernel/trace/trace_events_stage_2.h
+++ b/kernel/trace/trace_events_stage_2.h
@@ -20,7 +20,7 @@
  *
  *      field = (typeof(field))entry;
  *
- *      ret = trace_seq_printf(s, <TPRAWFMT> "%s", <ARGS> "\n");
+ *      ret = trace_seq_printf(s, <TP_RAW_FMT> "%s", <ARGS> "\n");
  *      if (!ret)
  *              return TRACE_TYPE_PARTIAL_LINE;
  *
@@ -44,8 +44,8 @@
         field->item,
 
 
-#undef TPRAWFMT
-#define TPRAWFMT(args...)       args
+#undef TP_RAW_FMT
+#define TP_RAW_FMT(args...)     args
 
 #undef TRACE_EVENT_FORMAT
 #define TRACE_EVENT_FORMAT(call, proto, args, fmt, tstruct, tpfmt)      \
diff --git a/kernel/trace/trace_events_stage_3.h b/kernel/trace/trace_events_stage_3.h
index 2c8d76c7dbed..557ca52bcdcd 100644
--- a/kernel/trace/trace_events_stage_3.h
+++ b/kernel/trace/trace_events_stage_3.h
@@ -106,8 +106,8 @@
  *
  */
 
-#undef TPFMT
-#define TPFMT(fmt, args...)     fmt "\n", ##args
+#undef TP_FMT
+#define TP_FMT(fmt, args...)    fmt "\n", ##args
 
 #define _TRACE_FORMAT(call, proto, args, fmt)                           \
 static void ftrace_event_##call(proto)                                  \
@@ -152,8 +152,8 @@ __attribute__((section("_ftrace_events"))) event_##call = {		\
 #define TRACE_FIELD(type, item, assign)\
         entry->item = assign;
 
-#undef TPCMD
-#define TPCMD(cmd...)   cmd
+#undef TP_CMD
+#define TP_CMD(cmd...)  cmd
 
 #undef TRACE_ENTRY
 #define TRACE_ENTRY     entry
diff --git a/kernel/trace/trace_export.c b/kernel/trace/trace_export.c
index 7162ab49d05d..e62bc10f8103 100644
--- a/kernel/trace/trace_export.c
+++ b/kernel/trace/trace_export.c
@@ -26,8 +26,8 @@
                 return 0;
 
 
-#undef TPRAWFMT
-#define TPRAWFMT(args...) args
+#undef TP_RAW_FMT
+#define TP_RAW_FMT(args...) args
 
 #undef TRACE_EVENT_FORMAT
 #define TRACE_EVENT_FORMAT(call, proto, args, fmt, tstruct, tpfmt)      \
@@ -57,8 +57,8 @@ ftrace_format_##call(struct trace_seq *s)				\
 #define TRACE_FIELD(type, item, assign)\
         entry->item = assign;
 
-#undef TPCMD
-#define TPCMD(cmd...)   cmd
+#undef TP_CMD
+#define TP_CMD(cmd...)  cmd
 
 #undef TRACE_ENTRY
 #define TRACE_ENTRY     entry
diff --git a/kernel/trace/trace_format.h b/kernel/trace/trace_format.h
deleted file mode 100644
index 97e59a9c82ea..000000000000
--- a/kernel/trace/trace_format.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Setup the showing format of trace point.
- *
- * int
- * ftrace_format_##call(struct trace_seq *s)
- * {
- *      struct ftrace_raw_##call field;
- *      int ret;
- *
- *      ret = trace_seq_printf(s, #type " " #item ";"
- *                             " size:%d; offset:%d;\n",
- *                             sizeof(field.type),
- *                             offsetof(struct ftrace_raw_##call,
- *                                      item));
- *
- * }
- */
-
-#undef TRACE_STRUCT
-#define TRACE_STRUCT(args...) args
-
-#undef TRACE_FIELD
-#define TRACE_FIELD(type, item, assign)                                 \
-        ret = trace_seq_printf(s, "\tfield:" #type " " #item ";\t"      \
-                               "offset:%u;\tsize:%u;\n",                \
-                               (unsigned int)offsetof(typeof(field), item), \
-                               (unsigned int)sizeof(field.item));       \
-        if (!ret)                                                       \
-                return 0;
-
-
-#undef TRACE_FIELD_SPECIAL
-#define TRACE_FIELD_SPECIAL(type_item, item, cmd)                       \
-        ret = trace_seq_printf(s, "\tfield special:" #type_item ";\t"   \
-                               "offset:%u;\tsize:%u;\n",                \
-                               (unsigned int)offsetof(typeof(field), item), \
-                               (unsigned int)sizeof(field.item));       \
-        if (!ret)                                                       \
-                return 0;
-
-#undef TRACE_EVENT_FORMAT
-#define TRACE_EVENT_FORMAT(call, proto, args, fmt, tstruct, tpfmt)      \
-static int                                                              \
-ftrace_format_##call(struct trace_seq *s)                               \
-{                                                                       \
-        struct ftrace_raw_##call field;                                 \
-        int ret;                                                        \
-                                                                        \
-        tstruct;                                                        \
-                                                                        \
-        trace_seq_printf(s, "\nprint fmt: \"%s\"\n", tpfmt);            \
-                                                                        \
-        return ret;                                                     \
-}
-