OpenE2K/linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

coresight: Remove name from platform description

Browse Source 
We are about to use a name independent of the parent AMBA device
name. As such, there is no need to have it in the platform description.
Let us move this to coresight description instead.

Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Suzuki K Poulose 2019-06-19 13:52:57 -06:00 committed by Greg Kroah-Hartman
parent aff70a45fe
commit 2ede79a6e8
12 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -551,6 +551,8 @@ static int catu_probe(struct amba_device *adev, const struct amba_id *id)
catu_desc.type = CORESIGHT_DEV_TYPE_HELPER;
catu_desc.subtype.helper_subtype = CORESIGHT_DEV_SUBTYPE_HELPER_CATU;
catu_desc.ops = &catu_ops;
catu_desc.name = dev_name(dev);
drvdata->csdev = coresight_register(&catu_desc);
if (IS_ERR(drvdata->csdev))
ret = PTR_ERR(drvdata->csdev);

3
drivers/hwtracing/coresight/coresight-etb10.c
View File

@ -777,12 +777,13 @@ static int etb_probe(struct amba_device *adev, const struct amba_id *id)
desc.ops = &etb_cs_ops;
desc.pdata = pdata;
desc.dev = dev;
desc.name = dev_name(dev);
desc.groups = coresight_etb_groups;
drvdata->csdev = coresight_register(&desc);
if (IS_ERR(drvdata->csdev))
return PTR_ERR(drvdata->csdev);
drvdata->miscdev.name = pdata->name;
drvdata->miscdev.name = desc.name;
drvdata->miscdev.minor = MISC_DYNAMIC_MINOR;
drvdata->miscdev.fops = &etb_fops;
ret = misc_register(&drvdata->miscdev);

1
drivers/hwtracing/coresight/coresight-etm3x.c
View File

@ -854,6 +854,7 @@ static int etm_probe(struct amba_device *adev, const struct amba_id *id)
desc.ops = &etm_cs_ops;
desc.pdata = pdata;
desc.dev = dev;
desc.name = dev_name(dev);
desc.groups = coresight_etm_groups;
drvdata->csdev = coresight_register(&desc);
if (IS_ERR(drvdata->csdev)) {

1
drivers/hwtracing/coresight/coresight-etm4x.c
View File

@ -1142,6 +1142,7 @@ static int etm4_probe(struct amba_device *adev, const struct amba_id *id)
desc.pdata = pdata;
desc.dev = dev;
desc.groups = coresight_etmv4_groups;
desc.name = dev_name(dev);
drvdata->csdev = coresight_register(&desc);
if (IS_ERR(drvdata->csdev)) {
ret = PTR_ERR(drvdata->csdev);

1
drivers/hwtracing/coresight/coresight-funnel.c
View File

@ -229,6 +229,7 @@ static int funnel_probe(struct device *dev, struct resource *res)
desc.ops = &funnel_cs_ops;
desc.pdata = pdata;
desc.dev = dev;
desc.name = dev_name(dev);
drvdata->csdev = coresight_register(&desc);
if (IS_ERR(drvdata->csdev)) {
ret = PTR_ERR(drvdata->csdev);

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

@ -323,9 +323,6 @@ coresight_get_platform_data(struct device *dev)
goto error;
}
/* Use device name as sysfs handle */
pdata->name = dev_name(dev);
if (is_of_node(fwnode))
ret = of_get_coresight_platform_data(dev, pdata);

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

@ -220,6 +220,8 @@ static int replicator_probe(struct device *dev, struct resource *res)
desc.ops = &replicator_cs_ops;
desc.pdata = dev->platform_data;
desc.dev = dev;
desc.name = dev_name(dev);
drvdata->csdev = coresight_register(&desc);
if (IS_ERR(drvdata->csdev)) {
ret = PTR_ERR(drvdata->csdev);

1
drivers/hwtracing/coresight/coresight-stm.c
View File

@ -871,6 +871,7 @@ static int stm_probe(struct amba_device *adev, const struct amba_id *id)
desc.ops = &stm_cs_ops;
desc.pdata = pdata;
desc.dev = dev;
desc.name = dev_name(dev);
desc.groups = coresight_stm_groups;
drvdata->csdev = coresight_register(&desc);
if (IS_ERR(drvdata->csdev)) {

5
drivers/hwtracing/coresight/coresight-tmc.c
View File

@ -437,6 +437,7 @@ static int tmc_probe(struct amba_device *adev, const struct amba_id *id)
desc.pdata = pdata;
desc.dev = dev;
desc.groups = coresight_tmc_groups;
desc.name = dev_name(dev);
switch (drvdata->config_type) {
case TMC_CONFIG_TYPE_ETB:
@ -461,7 +462,7 @@ static int tmc_probe(struct amba_device *adev, const struct amba_id *id)
desc.ops = &tmc_etf_cs_ops;
break;
default:
pr_err("%s: Unsupported TMC config\n", pdata->name);
pr_err("%s: Unsupported TMC config\n", desc.name);
ret = -EINVAL;
goto out;
}
@ -472,7 +473,7 @@ static int tmc_probe(struct amba_device *adev, const struct amba_id *id)
goto out;
}
drvdata->miscdev.name = pdata->name;
drvdata->miscdev.name = desc.name;
drvdata->miscdev.minor = MISC_DYNAMIC_MINOR;
drvdata->miscdev.fops = &tmc_fops;
ret = misc_register(&drvdata->miscdev);

1
drivers/hwtracing/coresight/coresight-tpiu.c
View File

@ -157,6 +157,7 @@ static int tpiu_probe(struct amba_device *adev, const struct amba_id *id)
desc.ops = &tpiu_cs_ops;
desc.pdata = pdata;
desc.dev = dev;
desc.name = dev_name(dev);
drvdata->csdev = coresight_register(&desc);
if (!IS_ERR(drvdata->csdev)) {

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

@ -1199,7 +1199,7 @@ struct coresight_device *coresight_register(struct coresight_desc *desc)
csdev->dev.parent = desc->dev;
csdev->dev.release = coresight_device_release;
csdev->dev.bus = &coresight_bustype;
dev_set_name(&csdev->dev, "%s", desc->pdata->name);
dev_set_name(&csdev->dev, "%s", desc->name);
ret = device_register(&csdev->dev);
if (ret) {

8
include/linux/coresight.h
View File

@ -91,13 +91,11 @@ union coresight_dev_subtype {
/**
* struct coresight_platform_data - data harvested from the DT specification
* @name: name of the component as shown under sysfs.
* @nr_inport: number of input ports for this component.
* @nr_outport: number of output ports for this component.
* @conns: Array of nr_outport connections from this component
*/
struct coresight_platform_data {
const char *name;
int nr_inport;
int nr_outport;
struct coresight_connection *conns;
@ -108,11 +106,12 @@ struct coresight_platform_data {
* @type: as defined by @coresight_dev_type.
* @subtype: as defined by @coresight_dev_subtype.
* @ops: generic operations for this component, as defined
by @coresight_ops.
* by @coresight_ops.
* @pdata: platform data collected from DT.
* @dev: The device entity associated to this component.
* @groups: operations specific to this component. These will end up
in the component's sysfs sub-directory.
* in the component's sysfs sub-directory.
* @name: name for the coresight device, also shown under sysfs.
*/
struct coresight_desc {
enum coresight_dev_type type;
@ -121,6 +120,7 @@ struct coresight_desc {
struct coresight_platform_data *pdata;
struct device *dev;
const struct attribute_group **groups;
const char *name;
};
/**