From: Leo Yan <leo.yan@arm.com>
To: Suzuki K Poulose <suzuki.poulose@arm.com>,
Mike Leach <mike.leach@arm.com>,
James Clark <james.clark@linaro.org>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Mathieu Poirier <mathieu.poirier@linaro.org>,
Mao Jinlong <quic_jinlmao@quicinc.com>
Cc: coresight@lists.linaro.org, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, Leo Yan <leo.yan@arm.com>
Subject: [PATCH v3 7/8] coresight: Do not mix success path with failure handling
Date: Mon, 02 Feb 2026 09:34:03 +0000 [thread overview]
Message-ID: <20260202-arm_coresight_refactor_dev_register-v3-7-03292470c48c@arm.com> (raw)
In-Reply-To: <20260202-arm_coresight_refactor_dev_register-v3-0-03292470c48c@arm.com>
Separate the failure handling path from the successful case. Use the
'out_unlock' label only for failure handling.
Signed-off-by: Leo Yan <leo.yan@arm.com>
---
drivers/hwtracing/coresight/coresight-core.c | 21 +++++++++++++--------
1 file changed, 13 insertions(+), 8 deletions(-)
diff --git a/drivers/hwtracing/coresight/coresight-core.c b/drivers/hwtracing/coresight/coresight-core.c
index c694b4bea3d724464e97a4932ead584d59d8a69a..955af43010446803030973c72f07315492b2fcf3 100644
--- a/drivers/hwtracing/coresight/coresight-core.c
+++ b/drivers/hwtracing/coresight/coresight-core.c
@@ -1398,17 +1398,22 @@ struct coresight_device *coresight_register(struct coresight_desc *desc)
registered = true;
ret = coresight_create_conns_sysfs_group(csdev);
- if (!ret)
- ret = coresight_fixup_orphan_conns(csdev);
+ if (ret)
+ goto out_unlock;
+
+ ret = coresight_fixup_orphan_conns(csdev);
+ if (ret)
+ goto out_unlock;
+
+ mutex_unlock(&coresight_mutex);
+
+ if (cti_assoc_ops && cti_assoc_ops->add)
+ cti_assoc_ops->add(csdev);
+
+ return csdev;
out_unlock:
mutex_unlock(&coresight_mutex);
- /* Success */
- if (!ret) {
- if (cti_assoc_ops && cti_assoc_ops->add)
- cti_assoc_ops->add(csdev);
- return csdev;
- }
/* Unregister the device if needed */
if (registered) {
--
2.34.1
next prev parent reply other threads:[~2026-02-02 9:34 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-02-02 9:33 [PATCH v3 0/8] coresight: Fix device registration and unregistration Leo Yan
2026-02-02 9:33 ` [PATCH v3 1/8] coresight: Fix memory leak in coresight_alloc_device_name() Leo Yan
2026-02-02 9:33 ` [PATCH v3 2/8] coresight: Get parent device reference after sink ID map allocation Leo Yan
2026-02-02 9:33 ` [PATCH v3 3/8] coresight: Protect unregistration with mutex Leo Yan
2026-02-02 9:34 ` [PATCH v3 4/8] coresight: Refactor output connection sysfs link cleanup Leo Yan
2026-02-02 9:34 ` [PATCH v3 5/8] coresight: Refactor sysfs connection group cleanup Leo Yan
2026-02-02 9:34 ` [PATCH v3 6/8] coresight: Move sink validation into etm_perf_add_symlink_sink() Leo Yan
2026-02-02 9:34 ` Leo Yan [this message]
2026-02-02 9:34 ` [PATCH v3 8/8] coresight: Unify error handling in coresight_register() Leo Yan
2026-02-03 11:15 ` James Clark
2026-02-09 11:28 ` Leo Yan
2026-02-09 11:59 ` Leo Yan
2026-02-03 11:13 ` [PATCH v3 0/8] coresight: Fix device registration and unregistration James Clark
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=20260202-arm_coresight_refactor_dev_register-v3-7-03292470c48c@arm.com \
--to=leo.yan@arm.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=coresight@lists.linaro.org \
--cc=gregkh@linuxfoundation.org \
--cc=james.clark@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mathieu.poirier@linaro.org \
--cc=mike.leach@arm.com \
--cc=quic_jinlmao@quicinc.com \
--cc=suzuki.poulose@arm.com \
/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®