leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

coresight: Pass coresight_device for coresight_release_platform_data

Browse Source 
As we prepare to expose the links between the devices in
sysfs, pass the coresight_device instance to the
coresight_release_platform_data in order to free up the connections
when the device is removed.

No functional changes as such in this patch.

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-2-mathieu.poirier@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Suzuki K Poulose 2020-05-18 12:02:20 -06:00 committed by Greg Kroah-Hartman
parent 2bd7d8df3e
commit d60250a459
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/hwtracing/coresight/coresight-platform.c
View File

@ -822,7 +822,7 @@ coresight_get_platform_data(struct device *dev)
error: error:
if (!IS_ERR_OR_NULL(pdata)) if (!IS_ERR_OR_NULL(pdata))
/* Cleanup the connection information */ /* Cleanup the connection information */
coresight_release_platform_data(pdata); coresight_release_platform_data(NULL, pdata);
return ERR_PTR(ret); return ERR_PTR(ret);
} }
EXPORT_SYMBOL_GPL(coresight_get_platform_data); EXPORT_SYMBOL_GPL(coresight_get_platform_data);

3
drivers/hwtracing/coresight/coresight-priv.h
View File

@ -211,7 +211,8 @@ static inline void *coresight_get_uci_data(const struct amba_id *id)
return 0; return 0;
} }
void coresight_release_platform_data(struct coresight_platform_data *pdata); void coresight_release_platform_data(struct coresight_device *csdev,
struct coresight_platform_data *pdata);
struct coresight_device * struct coresight_device *
coresight_find_csdev_by_fwnode(struct fwnode_handle *r_fwnode); coresight_find_csdev_by_fwnode(struct fwnode_handle *r_fwnode);
void coresight_set_assoc_ectdev_mutex(struct coresight_device *csdev, void coresight_set_assoc_ectdev_mutex(struct coresight_device *csdev,

7
drivers/hwtracing/coresight/coresight.c
View File

@ -1213,7 +1213,8 @@ postcore_initcall(coresight_init);
* coresight_release_platform_data: Release references to the devices connected * coresight_release_platform_data: Release references to the devices connected
* to the output port of this device. * to the output port of this device.
*/ */
void coresight_release_platform_data(struct coresight_platform_data *pdata) void coresight_release_platform_data(struct coresight_device *csdev,
struct coresight_platform_data *pdata)
{ {
int i; int i;
@ -1316,7 +1317,7 @@ err_free_csdev:
kfree(csdev); kfree(csdev);
err_out: err_out:
/* Cleanup the connection information */ /* Cleanup the connection information */
coresight_release_platform_data(desc->pdata); coresight_release_platform_data(NULL, desc->pdata);
return ERR_PTR(ret); return ERR_PTR(ret);
} }
EXPORT_SYMBOL_GPL(coresight_register); EXPORT_SYMBOL_GPL(coresight_register);
@ -1326,7 +1327,7 @@ void coresight_unregister(struct coresight_device *csdev)
etm_perf_del_symlink_sink(csdev); etm_perf_del_symlink_sink(csdev);
/* Remove references of that device in the topology */ /* Remove references of that device in the topology */
coresight_remove_conns(csdev); coresight_remove_conns(csdev);
coresight_release_platform_data(csdev->pdata); coresight_release_platform_data(csdev, csdev->pdata);
device_unregister(&csdev->dev); device_unregister(&csdev->dev);
} }
EXPORT_SYMBOL_GPL(coresight_unregister); EXPORT_SYMBOL_GPL(coresight_unregister);