Commit 4b8d63e5 authored by Steven Rostedt's avatar Steven Rostedt Committed by Steven Rostedt (Google)
Browse files

tracing: Simplify event_enable_func() goto_reg logic 

Currently there's an "out_reg:" label that gets jumped to if there's no
parameters to process. Instead, make it a proper "if (param) { }" block as
there's not much to do for the parameter processing, and remove the
"out_reg:" label.

Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: https://lore.kernel.org/20241219201345.354746196@goodmis.org


Signed-off-by: default avatarSteven Rostedt (Google) <rostedt@goodmis.org>
parent c949dfb9

kernel/trace/trace_events.c

+13 −15
Original line number Diff line number Diff line
@@ -3799,9 +3799,7 @@ event_enable_func(struct trace_array *tr, struct ftrace_hash *hash, 


	ret = -ENOMEM;



	if (!param)

		goto out_reg;



	if (param) {

		number = strsep(&param, ":");



		ret = -EINVAL;
@@ -3815,8 +3813,8 @@ event_enable_func(struct trace_array *tr, struct ftrace_hash *hash, 
		ret = kstrtoul(number, 0, &count);

		if (ret)

			goto out;

	}



 out_reg:

	/* Don't let event modules unload while probe registered */

	ret = trace_event_try_get_ref(file->event_call);

	if (!ret) {