tracing: Convert some power events to DEFINE_EVENT

Use DECLARE_EVENT_CLASS to remove duplicate code:

   text    data     bss     dec     hex filename
   4312     524      12    4848    12f0 kernel/trace/power-traces.o.old
   3455     524       8    3987     f93 kernel/trace/power-traces.o

Two events are converted:

  power: power_start, power_frequency

No change in functionality.

Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Arjan van de Ven <arjan@infradead.org>
LKML-Reference: <4B0E28C2.1090906@cn.fujitsu.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --git a/include/trace/events/power.h b/include/trace/events/power.h
index 9bb96e5..c4efe9b 100644 (file)
--- a/include/trace/events/power.h
+++ b/include/trace/events/power.h
@@ -16,7 +16,7 @@ enum {
 };
 #endif
 
-TRACE_EVENT(power_start,
+DECLARE_EVENT_CLASS(power,
 
        TP_PROTO(unsigned int type, unsigned int state),
 
@@ -35,42 +35,36 @@ TRACE_EVENT(power_start,
        TP_printk("type=%lu state=%lu", (unsigned long)__entry->type, (unsigned long)__entry->state)
 );
 
-TRACE_EVENT(power_end,
-
-       TP_PROTO(int dummy),
+DEFINE_EVENT(power, power_start,
 
-       TP_ARGS(dummy),
+       TP_PROTO(unsigned int type, unsigned int state),
 
-       TP_STRUCT__entry(
-               __field(        u64,            dummy           )
-       ),
+       TP_ARGS(type, state)
+);
 
-       TP_fast_assign(
-               __entry->dummy = 0xffff;
-       ),
+DEFINE_EVENT(power, power_frequency,
 
-       TP_printk("dummy=%lu", (unsigned long)__entry->dummy)
+       TP_PROTO(unsigned int type, unsigned int state),
 
+       TP_ARGS(type, state)
 );
 
+TRACE_EVENT(power_end,
 
-TRACE_EVENT(power_frequency,
-
-       TP_PROTO(unsigned int type, unsigned int state),
+       TP_PROTO(int dummy),
 
-       TP_ARGS(type, state),
+       TP_ARGS(dummy),
 
        TP_STRUCT__entry(
-               __field(        u64,            type            )
-               __field(        u64,            state           )
+               __field(        u64,            dummy           )
        ),
 
        TP_fast_assign(
-               __entry->type = type;
-               __entry->state = state;
+               __entry->dummy = 0xffff;
        ),
 
-       TP_printk("type=%lu state=%lu", (unsigned long)__entry->type, (unsigned long) __entry->state)
+       TP_printk("dummy=%lu", (unsigned long)__entry->dummy)
+
 );
 
 #endif /* _TRACE_POWER_H */