X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Fregulator.h;h=d1fc51f8891efca30313bba771249da3462dc794;hb=6f34b85f4a6503632c99f4dbb12e79232ebce49d;hp=a84c24cefeee6ee5273f53b502f55080b124938a;hpb=3bc29f0a41b3c803245b845db2e1909042e72e9c;p=lttng-modules.git

diff --git a/instrumentation/events/lttng-module/regulator.h b/instrumentation/events/lttng-module/regulator.h
index a84c24ce..d1fc51f8 100644
--- a/instrumentation/events/lttng-module/regulator.h
+++ b/instrumentation/events/lttng-module/regulator.h
@@ -4,7 +4,7 @@
 #if !defined(LTTNG_TRACE_REGULATOR_H) || defined(TRACE_HEADER_MULTI_READ)
 #define LTTNG_TRACE_REGULATOR_H
 
-#include "../../../probes/lttng-tracepoint-event.h"
+#include <probes/lttng-tracepoint-event.h>
 #include <linux/ktime.h>
 
 /*
@@ -17,16 +17,9 @@ LTTNG_TRACEPOINT_EVENT_CLASS(regulator_basic,
 
 	TP_ARGS(name),
 
-	TP_STRUCT__entry(
-		__string(	name,	name	)
-	),
-
-	TP_fast_assign(
-		tp_strcpy(name, name)
-	),
-
-	TP_printk("name=%s", __get_str(name))
-
+	TP_FIELDS(
+		ctf_string(name, name)
+	)
 )
 
 LTTNG_TRACEPOINT_EVENT_INSTANCE(regulator_basic, regulator_enable,
@@ -79,20 +72,11 @@ LTTNG_TRACEPOINT_EVENT_CLASS(regulator_range,
 
 	TP_ARGS(name, min, max),
 
-	TP_STRUCT__entry(
-		__string(	name,		name		)
-		__field(        int,            min             )
-		__field(        int,            max             )
-	),
-
-	TP_fast_assign(
-		tp_strcpy(name, name)
-		tp_assign(min, min)
-		tp_assign(max, max)
-	),
-
-	TP_printk("name=%s (%d-%d)", __get_str(name),
-		  (int)__entry->min, (int)__entry->max)
+	TP_FIELDS(
+		ctf_string(name, name)
+		ctf_integer(int, min, min)
+		ctf_integer(int, max, max)
+	)
 )
 
 LTTNG_TRACEPOINT_EVENT_INSTANCE(regulator_range, regulator_set_voltage,
@@ -113,18 +97,10 @@ LTTNG_TRACEPOINT_EVENT_CLASS(regulator_value,
 
 	TP_ARGS(name, val),
 
-	TP_STRUCT__entry(
-		__string(	name,		name		)
-		__field(        unsigned int,   val             )
-	),
-
-	TP_fast_assign(
-		tp_strcpy(name, name)
-		tp_assign(val, val)
-	),
-
-	TP_printk("name=%s, val=%u", __get_str(name),
-		  (int)__entry->val)
+	TP_FIELDS(
+		ctf_string(name, name)
+		ctf_integer(unsigned int, val, val)
+	)
 )
 
 LTTNG_TRACEPOINT_EVENT_INSTANCE(regulator_value, regulator_set_voltage_complete,
@@ -138,4 +114,4 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(regulator_value, regulator_set_voltage_complete,
 #endif /* _TRACE_POWER_H */
 
 /* This part must be outside protection */
-#include "../../../probes/define_trace.h"
+#include <probes/define_trace.h>