[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20260126-arm_coresight_refactor_dev_register-v2-8-b5a3c0441c15@arm.com>
Date: Mon, 26 Jan 2026 13:52:08 +0000
From: Leo Yan <leo.yan@....com>
To: Suzuki K Poulose <suzuki.poulose@....com>,
Mike Leach <mike.leach@...aro.org>, James Clark <james.clark@...aro.org>,
Alexander Shishkin <alexander.shishkin@...ux.intel.com>,
Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
Mathieu Poirier <mathieu.poirier@...aro.org>,
Mao Jinlong <quic_jinlmao@...cinc.com>
Cc: coresight@...ts.linaro.org, linux-arm-kernel@...ts.infradead.org,
linux-kernel@...r.kernel.org, Leo Yan <leo.yan@....com>
Subject: [PATCH v2 8/8] coresight: Unify error handling in
coresight_register()
Unify error handling during registration:
1) Failures before device registration are handled by err_out, which
releases platform data.
2) Jump to the out_unlock label on failures after device registration
to unwind the flow via coresight_unregister().
The "registered" variable is no longer used, remove it.
Signed-off-by: Leo Yan <leo.yan@....com>
---
drivers/hwtracing/coresight/coresight-core.c | 17 +++++------------
1 file changed, 5 insertions(+), 12 deletions(-)
diff --git a/drivers/hwtracing/coresight/coresight-core.c b/drivers/hwtracing/coresight/coresight-core.c
index c2b5a6efd1c01b0fbfbc289cf27232ccc731ba34..0aa64ee36dd06f86d3f6be1cab3067bf91467686 100644
--- a/drivers/hwtracing/coresight/coresight-core.c
+++ b/drivers/hwtracing/coresight/coresight-core.c
@@ -1323,7 +1323,6 @@ struct coresight_device *coresight_register(struct coresight_desc *desc)
{
int ret;
struct coresight_device *csdev;
- bool registered = false;
csdev = kzalloc(sizeof(*csdev), GFP_KERNEL);
if (!csdev) {
@@ -1377,7 +1376,8 @@ struct coresight_device *coresight_register(struct coresight_desc *desc)
* All resources are free'd explicitly via
* coresight_device_release(), triggered from put_device().
*/
- goto out_unlock;
+ mutex_unlock(&coresight_mutex);
+ goto err_out;
}
ret = etm_perf_add_symlink_sink(csdev);
@@ -1387,12 +1387,8 @@ struct coresight_device *coresight_register(struct coresight_desc *desc)
* coresight_device_release() triggered from put_device(), which is in
* turn called from function device_unregister().
*/
- if (ret && ret != -EOPNOTSUPP) {
- device_unregister(&csdev->dev);
+ if (ret && ret != -EOPNOTSUPP)
goto out_unlock;
- }
- /* Device is now registered */
- registered = true;
ret = coresight_create_conns_sysfs_group(csdev);
if (ret)
@@ -1412,11 +1408,8 @@ struct coresight_device *coresight_register(struct coresight_desc *desc)
out_unlock:
mutex_unlock(&coresight_mutex);
- /* Unregister the device if needed */
- if (registered) {
- coresight_unregister(csdev);
- return ERR_PTR(ret);
- }
+ coresight_unregister(csdev);
+ return ERR_PTR(ret);
err_out:
coresight_release_platform_data(desc->dev, desc->pdata);
--
2.34.1
Powered by blists - more mailing lists