mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Steven Rostedt <rostedt@goodmis.org>
To: linux-kernel@vger.kernel.org
Cc: Masami Hiramatsu <mhiramat@kernel.org>,
	Mark Rutland <mark.rutland@arm.com>,
	Mathieu Desnoyers <mathieu.desnoyers@efficios.com>,
	Andrew Morton <akpm@linux-foundation.org>,
	Peter Zijlstra <peterz@infradead.org>
Subject: [for-next][PATCH 05/15] tracing: Simplify event_enable_func() goto_reg logic
Date: Thu, 26 Dec 2024 09:39:19 -0500	[thread overview]
Message-ID: <20241226143935.495660565@goodmis.org> (raw)
In-Reply-To: <20241226143914.397394975@goodmis.org>

From: Steven Rostedt <rostedt@goodmis.org>

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: Steven Rostedt (Google) <rostedt@goodmis.org>
---
 kernel/trace/trace_events.c | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
index 43e9545b5cf3..86db6ee6f26c 100644
--- a/kernel/trace/trace_events.c
+++ b/kernel/trace/trace_events.c
@@ -3799,24 +3799,22 @@ event_enable_func(struct trace_array *tr, struct ftrace_hash *hash,
 
 	ret = -ENOMEM;
 
-	if (!param)
-		goto out_reg;
-
-	number = strsep(&param, ":");
+	if (param) {
+		number = strsep(&param, ":");
 
-	ret = -EINVAL;
-	if (!strlen(number))
-		goto out;
+		ret = -EINVAL;
+		if (!strlen(number))
+			goto out;
 
-	/*
-	 * We use the callback data field (which is a pointer)
-	 * as our counter.
-	 */
-	ret = kstrtoul(number, 0, &count);
-	if (ret)
-		goto out;
+		/*
+		 * We use the callback data field (which is a pointer)
+		 * as our counter.
+		 */
+		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) {
-- 
2.45.2



  parent reply	other threads:[~2024-12-26 14:38 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-12-26 14:39 [for-next][PATCH 00/15] tracing: Updates for v6.14 Steven Rostedt
2024-12-26 14:39 ` [for-next][PATCH 01/15] tracing: Switch trace.c code over to use guard() Steven Rostedt
2024-12-28 10:40   ` Markus Elfring
2024-12-26 14:39 ` [for-next][PATCH 02/15] tracing: Return -EINVAL if a boot tracer tries to enable the mmiotracer at boot Steven Rostedt
2024-12-26 14:39 ` [for-next][PATCH 03/15] tracing: Have event_enable_write() just return error on error Steven Rostedt
2024-12-26 14:39 ` [for-next][PATCH 04/15] tracing: Simplify event_enable_func() goto out_free logic Steven Rostedt
2024-12-26 14:39 ` Steven Rostedt [this message]
2024-12-26 14:39 ` [for-next][PATCH 06/15] tracing: Switch trace_events.c code over to use guard() Steven Rostedt
2024-12-26 14:39 ` [for-next][PATCH 07/15] tracing: Switch trace_events_hist.c " Steven Rostedt
2024-12-26 14:39 ` [for-next][PATCH 08/15] tracing: Switch trace_events_trigger.c " Steven Rostedt
2024-12-28 13:52   ` Markus Elfring
2024-12-26 14:39 ` [for-next][PATCH 09/15] tracing: Switch trace_events_filter.c " Steven Rostedt
2024-12-26 14:39 ` [for-next][PATCH 10/15] tracing: Switch trace_events_synth.c " Steven Rostedt
2024-12-26 14:39 ` [for-next][PATCH 11/15] tracing: Switch trace_osnoise.c code over to use guard() and __free() Steven Rostedt
2024-12-28 14:01   ` Markus Elfring
2024-12-26 14:39 ` [for-next][PATCH 12/15] tracing: Switch trace_stack.c code over to use guard() Steven Rostedt
2024-12-26 14:39 ` [for-next][PATCH 13/15] tracing: Switch trace_stat.c " Steven Rostedt
2024-12-26 14:39 ` [for-next][PATCH 14/15] tracing/string: Create and use __free(argv_free) in trace_dynevent.c Steven Rostedt
2024-12-26 14:39 ` [for-next][PATCH 15/15] tracepoint: Reduce duplication of __DO_TRACE_CALL Steven Rostedt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20241226143935.495660565@goodmis.org \
    --to=rostedt@goodmis.org \
    --cc=akpm@linux-foundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mark.rutland@arm.com \
    --cc=mathieu.desnoyers@efficios.com \
    --cc=mhiramat@kernel.org \
    --cc=peterz@infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®