From nobody Sun Feb 8 21:27:01 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3EB8042AAB for ; Thu, 26 Dec 2024 14:38:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735223917; cv=none; b=X1t89n8DvufY6Hx3YiuNqTV/S1S+ir5GV2+yL1bjY3dIPpAiHPWx7OUKsMSQPikj6GEHRDA0DZ4vP5vNckXyjogjn05m9noC2y/iSKYArdy66sbApfXVWO7Nwl94kPKy59Ac/wB8YWubILCKdRHYvLxXzUdarLNlQCj0DQ6/xOk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735223917; c=relaxed/simple; bh=dCt9NsS7L5Czuy03Q5C+R5kYpdWgy9xrP1aqFdvEiSs=; h=Message-ID:Date:From:To:Cc:Subject:References:MIME-Version: Content-Type; b=TJmDm12zjLl0awxDWITCNO2VBBc18peh8uSKPyKarT2hslfWZ42ThLRWfWg7mHKCBb8sHENVMkUNVuT37F/IgENGf6ZcnST41ngv88wTBINHuvu6zpKb7533gC7xNNXXyQjH3e3tAmxwvuR6f/7K4CyWTz2KQZqhnXKkd8/4758= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id C9EB5C4CED1; Thu, 26 Dec 2024 14:38:36 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.98) (envelope-from ) id 1tQp1T-0000000G1rG-2hLR; Thu, 26 Dec 2024 09:39:35 -0500 Message-ID: <20241226143935.495660565@goodmis.org> User-Agent: quilt/0.68 Date: Thu, 26 Dec 2024 09:39:19 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Andrew Morton , Peter Zijlstra Subject: [for-next][PATCH 05/15] tracing: Simplify event_enable_func() goto_reg logic References: <20241226143914.397394975@goodmis.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Steven Rostedt 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 Cc: Mark Rutland Cc: Mathieu Desnoyers Cc: Andrew Morton Cc: Peter Zijlstra Link: https://lore.kernel.org/20241219201345.354746196@goodmis.org Signed-off-by: Steven Rostedt (Google) --- 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 ft= race_hash *hash, =20 ret =3D -ENOMEM; =20 - if (!param) - goto out_reg; - - number =3D strsep(¶m, ":"); + if (param) { + number =3D strsep(¶m, ":"); =20 - ret =3D -EINVAL; - if (!strlen(number)) - goto out; + ret =3D -EINVAL; + if (!strlen(number)) + goto out; =20 - /* - * We use the callback data field (which is a pointer) - * as our counter. - */ - ret =3D kstrtoul(number, 0, &count); - if (ret) - goto out; + /* + * We use the callback data field (which is a pointer) + * as our counter. + */ + ret =3D kstrtoul(number, 0, &count); + if (ret) + goto out; + } =20 - out_reg: /* Don't let event modules unload while probe registered */ ret =3D trace_event_try_get_ref(file->event_call); if (!ret) { --=20 2.45.2