1 files changed, 24 insertions, 14 deletions

diff --git a/include/trace/irq_event_types.h b/include/trace/irq_event_types.h
index 0147d9eef5f4..43bcb74dd49f 100644
--- a/include/trace/irq_event_types.h
+++ b/include/trace/irq_event_types.h
@@ -8,26 +8,36 @@
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM irq
 
-TRACE_EVENT_FORMAT(irq_handler_entry,
+/*
+ * Tracepoint for entry of interrupt handler:
+ */
+TRACE_FORMAT(irq_handler_entry,
         TP_PROTO(int irq, struct irqaction *action),
         TP_ARGS(irq, action),
-        TP_FMT("irq=%d handler=%s", irq, action->name),
-        TRACE_STRUCT(
-                TRACE_FIELD(int, irq, irq)
-        ),
-        TP_RAW_FMT("irq %d")
+        TP_FMT("irq=%d handler=%s", irq, action->name)
         );
 
-TRACE_EVENT_FORMAT(irq_handler_exit,
+/*
+ * Tracepoint for return of an interrupt handler:
+ */
+TRACE_EVENT(irq_handler_exit,
+
         TP_PROTO(int irq, struct irqaction *action, int ret),
+
         TP_ARGS(irq, action, ret),
-        TP_FMT("irq=%d handler=%s return=%s",
-                irq, action->name, ret ? "handled" : "unhandled"),
-        TRACE_STRUCT(
-                TRACE_FIELD(int, irq, irq)
-                TRACE_FIELD(int, ret, ret)
+
+        TP_STRUCT__entry(
+                __field(        int,    irq     )
+                __field(        int,    ret     )
         ),
-        TP_RAW_FMT("irq %d ret %d")
-        );
+
+        TP_printk("irq=%d return=%s",
+                  __entry->irq, __entry->ret ? "handled" : "unhandled"),
+
+        TP_fast_assign(
+                __entry->irq    = irq;
+                __entry->ret    = ret;
+        )
+);
 
 #undef TRACE_SYSTEM