Commit 68a5d5fc authored by Suzuki K Poulose's avatar Suzuki K Poulose Committed by Greg Kroah-Hartman

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: default avatarSuzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: default avatarMike Leach <mike.leach@linaro.org>
Signed-off-by: default avatarMathieu Poirier <mathieu.poirier@linaro.org>
Link: https://lore.kernel.org/r/20200518180242.7916-3-mathieu.poirier@linaro.orgSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d60250a4
...@@ -1073,18 +1073,14 @@ static int coresight_orphan_match(struct device *dev, void *data) ...@@ -1073,18 +1073,14 @@ static int coresight_orphan_match(struct device *dev, void *data)
return 0; return 0;
} }
static void coresight_fixup_orphan_conns(struct coresight_device *csdev) static int coresight_fixup_orphan_conns(struct coresight_device *csdev)
{ {
/* return bus_for_each_dev(&coresight_bustype, NULL,
* 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,
csdev, coresight_orphan_match); 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; int i;
...@@ -1096,6 +1092,8 @@ static void coresight_fixup_device_conns(struct coresight_device *csdev) ...@@ -1096,6 +1092,8 @@ static void coresight_fixup_device_conns(struct coresight_device *csdev)
if (!conn->child_dev) if (!conn->child_dev)
csdev->orphan = true; csdev->orphan = true;
} }
return 0;
} }
static int coresight_remove_match(struct device *dev, void *data) static int coresight_remove_match(struct device *dev, void *data)
...@@ -1305,11 +1303,17 @@ struct coresight_device *coresight_register(struct coresight_desc *desc) ...@@ -1305,11 +1303,17 @@ struct coresight_device *coresight_register(struct coresight_desc *desc)
mutex_lock(&coresight_mutex); mutex_lock(&coresight_mutex);
coresight_fixup_device_conns(csdev); ret = coresight_fixup_device_conns(csdev);
coresight_fixup_orphan_conns(csdev); if (!ret)
ret = coresight_fixup_orphan_conns(csdev);
if (!ret)
cti_add_assoc_to_csdev(csdev); cti_add_assoc_to_csdev(csdev);
mutex_unlock(&coresight_mutex); mutex_unlock(&coresight_mutex);
if (ret) {
coresight_unregister(csdev);
return ERR_PTR(ret);
}
return csdev; return csdev;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment