coresight: Do not mix success path with failure handling

Separate the failure handling path from the successful case.  Use the
'out_unlock' label only for failure handling.

Reviewed-by: James Clark <james.clark@linaro.org>
Signed-off-by: Leo Yan <leo.yan@arm.com>
Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com>
Link: https://lore.kernel.org/r/20260209-arm_coresight_refactor_dev_register-v4-7-62d6042f76f7@arm.com

diff --git a/drivers/hwtracing/coresight/coresight-core.c b/drivers/hwtracing/coresight/coresight-core.c
index 6ddbc773330e592036ca45c84eeb46cc034670cb..e04545295240d5b25d233e75aa1bad5df0cab699 100644 (file)
--- 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) {