coresight: Add return value for fixup connections

Handle failures in fixing up connections for a newly registered
device. This will be useful to handle cases where we fail to expose
the links via sysfs for the connections.

Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: Mike Leach <mike.leach@linaro.org>
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Link: https://lore.kernel.org/r/20200518180242.7916-3-mathieu.poirier@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/hwtracing/coresight/coresight.c b/drivers/hwtracing/coresight/coresight.c
index 10e756410d3c44511d50ab7b012000fb1ed12787..07f66a3968f18ed243c88c76061e51885d6e9238 100644 (file)
--- a/drivers/hwtracing/coresight/coresight.c
+++ b/drivers/hwtracing/coresight/coresight.c
@@ -1073,18 +1073,14 @@ static int coresight_orphan_match(struct device *dev, void *data)
        return 0;
 }
 
-static void coresight_fixup_orphan_conns(struct coresight_device *csdev)
+static int coresight_fixup_orphan_conns(struct coresight_device *csdev)
 {
-       /*
-        * No need to check for a return value as orphan connection(s)
-        * are hooked-up with each newly added component.
-        */
-       bus_for_each_dev(&coresight_bustype, NULL,
+       return bus_for_each_dev(&coresight_bustype, NULL,
                         csdev, coresight_orphan_match);
 }
 
 
-static void coresight_fixup_device_conns(struct coresight_device *csdev)
+static int coresight_fixup_device_conns(struct coresight_device *csdev)
 {
        int i;
 
@@ -1096,6 +1092,8 @@ static void coresight_fixup_device_conns(struct coresight_device *csdev)
                if (!conn->child_dev)
                        csdev->orphan = true;
        }
+
+       return 0;
 }
 
 static int coresight_remove_match(struct device *dev, void *data)
@@ -1305,11 +1303,17 @@ struct coresight_device *coresight_register(struct coresight_desc *desc)
 
        mutex_lock(&coresight_mutex);
 
-       coresight_fixup_device_conns(csdev);
-       coresight_fixup_orphan_conns(csdev);
-       cti_add_assoc_to_csdev(csdev);
+       ret = coresight_fixup_device_conns(csdev);
+       if (!ret)
+               ret = coresight_fixup_orphan_conns(csdev);
+       if (!ret)
+               cti_add_assoc_to_csdev(csdev);
 
        mutex_unlock(&coresight_mutex);
+       if (ret) {
+               coresight_unregister(csdev);
+               return ERR_PTR(ret);
+       }
 
        return csdev;