]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
rv: Remove trailing whitespace from tracepoint string
authorGabriele Monaco <gmonaco@redhat.com>
Mon, 28 Jul 2025 13:50:14 +0000 (15:50 +0200)
committerSteven Rostedt (Google) <rostedt@goodmis.org>
Mon, 28 Jul 2025 20:47:34 +0000 (16:47 -0400)
RV event tracepoints print a line with the format:
    "event_xyz: S0 x event -> S1 "
    "event_xyz: S1 x event -> S0 (final)"

While printing an event leading to a non-final state, the line
has a trailing white space (visible above before the closing ").

Adapt the format string not to print the trailing whitespace if we are
not printing "(final)".

Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Tomas Glozar <tglozar@redhat.com>
Cc: Juri Lelli <jlelli@redhat.com>
Cc: Clark Williams <williams@redhat.com>
Cc: John Kacur <jkacur@redhat.com>
Link: https://lore.kernel.org/20250728135022.255578-3-gmonaco@redhat.com
Reviewed-by: Nam Cao <namcao@linutronix.de>
Signed-off-by: Gabriele Monaco <gmonaco@redhat.com>
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
kernel/trace/rv/rv_trace.h

index b6f3104984664888a4e49c13fa7571888b447006..17ba07329b670ac3746b63f34036e45f315079fb 100644 (file)
@@ -29,11 +29,11 @@ DECLARE_EVENT_CLASS(event_da_monitor,
                __entry->final_state            = final_state;
        ),
 
-       TP_printk("%s x %s -> %s %s",
+       TP_printk("%s x %s -> %s%s",
                __entry->state,
                __entry->event,
                __entry->next_state,
-               __entry->final_state ? "(final)" : "")
+               __entry->final_state ? " (final)" : "")
 );
 
 DECLARE_EVENT_CLASS(error_da_monitor,
@@ -90,12 +90,12 @@ DECLARE_EVENT_CLASS(event_da_monitor_id,
                __entry->final_state            = final_state;
        ),
 
-       TP_printk("%d: %s x %s -> %s %s",
+       TP_printk("%d: %s x %s -> %s%s",
                __entry->id,
                __entry->state,
                __entry->event,
                __entry->next_state,
-               __entry->final_state ? "(final)" : "")
+               __entry->final_state ? " (final)" : "")
 );
 
 DECLARE_EVENT_CLASS(error_da_monitor_id,