History

coresight: Remove name from platform description

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.

Suzuki K Poulose committed 7 years ago

Commit 2ede79a1 parent aff70a412 files · +19 −11Browse files

Unified · Split

12 files
  1. drivers/hwtracing/coresight/coresight-catu.c +2 −0
  2. drivers/hwtracing/coresight/coresight-etb10.c +2 −1
  3. drivers/hwtracing/coresight/coresight-etm3x.c +1 −0
  4. drivers/hwtracing/coresight/coresight-etm4x.c +1 −0
  5. drivers/hwtracing/coresight/coresight-funnel.c +1 −0
  6. drivers/hwtracing/coresight/coresight-platform.c +0 −3
  7. drivers/hwtracing/coresight/coresight-replicator.c +2 −0
  8. drivers/hwtracing/coresight/coresight-stm.c +1 −0
  9. drivers/hwtracing/coresight/coresight-tmc.c +3 −2
  10. drivers/hwtracing/coresight/coresight-tpiu.c +1 −0
  11. drivers/hwtracing/coresight/coresight.c +1 −1
  12. include/linux/coresight.h +4 −4
drivers/hwtracing/coresight/coresight-catu.c+2−0
@@ -551,6 +551,8 @@ static int catu_probe(struct amba_device *adev, const struct amba_id *id) · 550 unmodified lines
551 catu_desc.type = CORESIGHT_DEV_TYPE_HELPER;551 catu_desc.type = CORESIGHT_DEV_TYPE_HELPER;
552 catu_desc.subtype.helper_subtype = CORESIGHT_DEV_SUBTYPE_HELPER_CATU;552 catu_desc.subtype.helper_subtype = CORESIGHT_DEV_SUBTYPE_HELPER_CATU;
553 catu_desc.ops = &catu_ops;553 catu_desc.ops = &catu_ops;
554 catu_desc.name = dev_name(dev);
555
554 drvdata->csdev = coresight_register(&catu_desc);556 drvdata->csdev = coresight_register(&catu_desc);
555 if (IS_ERR(drvdata->csdev))557 if (IS_ERR(drvdata->csdev))
556 ret = PTR_ERR(drvdata->csdev);558 ret = PTR_ERR(drvdata->csdev);
drivers/hwtracing/coresight/coresight-etb10.c+2−1
@@ -777,12 +777,13 @@ static int etb_probe(struct amba_device *adev, const struct amba_id *id) · 776 unmodified lines
777 desc.ops = &etb_cs_ops;777 desc.ops = &etb_cs_ops;
778 desc.pdata = pdata;778 desc.pdata = pdata;
779 desc.dev = dev;779 desc.dev = dev;
780 desc.name = dev_name(dev);
780 desc.groups = coresight_etb_groups;781 desc.groups = coresight_etb_groups;
781 drvdata->csdev = coresight_register(&desc);782 drvdata->csdev = coresight_register(&desc);
782 if (IS_ERR(drvdata->csdev))783 if (IS_ERR(drvdata->csdev))
783 return PTR_ERR(drvdata->csdev);784 return PTR_ERR(drvdata->csdev);
784 785
785 drvdata->miscdev.name = pdata->name;786 drvdata->miscdev.name = desc.name;
786 drvdata->miscdev.minor = MISC_DYNAMIC_MINOR;787 drvdata->miscdev.minor = MISC_DYNAMIC_MINOR;
787 drvdata->miscdev.fops = &etb_fops;788 drvdata->miscdev.fops = &etb_fops;
788 ret = misc_register(&drvdata->miscdev);789 ret = misc_register(&drvdata->miscdev);
drivers/hwtracing/coresight/coresight-etm3x.c+1−0
@@ -854,6 +854,7 @@ static int etm_probe(struct amba_device *adev, const struct amba_id *id) · 853 unmodified lines
854 desc.ops = &etm_cs_ops;854 desc.ops = &etm_cs_ops;
855 desc.pdata = pdata;855 desc.pdata = pdata;
856 desc.dev = dev;856 desc.dev = dev;
857 desc.name = dev_name(dev);
857 desc.groups = coresight_etm_groups;858 desc.groups = coresight_etm_groups;
858 drvdata->csdev = coresight_register(&desc);859 drvdata->csdev = coresight_register(&desc);
859 if (IS_ERR(drvdata->csdev)) {860 if (IS_ERR(drvdata->csdev)) {
drivers/hwtracing/coresight/coresight-etm4x.c+1−0
@@ -1142,6 +1142,7 @@ static int etm4_probe(struct amba_device *adev, const struct amba_id *id) · 1141 unmodified lines
1142 desc.pdata = pdata;1142 desc.pdata = pdata;
1143 desc.dev = dev;1143 desc.dev = dev;
1144 desc.groups = coresight_etmv4_groups;1144 desc.groups = coresight_etmv4_groups;
1145 desc.name = dev_name(dev);
1145 drvdata->csdev = coresight_register(&desc);1146 drvdata->csdev = coresight_register(&desc);
1146 if (IS_ERR(drvdata->csdev)) {1147 if (IS_ERR(drvdata->csdev)) {
1147 ret = PTR_ERR(drvdata->csdev);1148 ret = PTR_ERR(drvdata->csdev);
drivers/hwtracing/coresight/coresight-funnel.c+1−0
@@ -229,6 +229,7 @@ static int funnel_probe(struct device *dev, struct resource *res) · 228 unmodified lines
229 desc.ops = &funnel_cs_ops;229 desc.ops = &funnel_cs_ops;
230 desc.pdata = pdata;230 desc.pdata = pdata;
231 desc.dev = dev;231 desc.dev = dev;
232 desc.name = dev_name(dev);
232 drvdata->csdev = coresight_register(&desc);233 drvdata->csdev = coresight_register(&desc);
233 if (IS_ERR(drvdata->csdev)) {234 if (IS_ERR(drvdata->csdev)) {
234 ret = PTR_ERR(drvdata->csdev);235 ret = PTR_ERR(drvdata->csdev);
drivers/hwtracing/coresight/coresight-platform.c+0−3
@@ -323,9 +323,6 @@ coresight_get_platform_data(struct device *dev) · 322 unmodified lines
323 goto error;323 goto error;
324 }324 }
325 325
326 /* Use device name as sysfs handle */
327 pdata->name = dev_name(dev);
328
329 if (is_of_node(fwnode))326 if (is_of_node(fwnode))
330 ret = of_get_coresight_platform_data(dev, pdata);327 ret = of_get_coresight_platform_data(dev, pdata);
331 328
drivers/hwtracing/coresight/coresight-replicator.c+2−0
@@ -220,6 +220,8 @@ static int replicator_probe(struct device *dev, struct resource *res) · 219 unmodified lines
220 desc.ops = &replicator_cs_ops;220 desc.ops = &replicator_cs_ops;
221 desc.pdata = dev->platform_data;221 desc.pdata = dev->platform_data;
222 desc.dev = dev;222 desc.dev = dev;
223 desc.name = dev_name(dev);
224
223 drvdata->csdev = coresight_register(&desc);225 drvdata->csdev = coresight_register(&desc);
224 if (IS_ERR(drvdata->csdev)) {226 if (IS_ERR(drvdata->csdev)) {
225 ret = PTR_ERR(drvdata->csdev);227 ret = PTR_ERR(drvdata->csdev);
drivers/hwtracing/coresight/coresight-stm.c+1−0
@@ -871,6 +871,7 @@ static int stm_probe(struct amba_device *adev, const struct amba_id *id) · 870 unmodified lines
871 desc.ops = &stm_cs_ops;871 desc.ops = &stm_cs_ops;
872 desc.pdata = pdata;872 desc.pdata = pdata;
873 desc.dev = dev;873 desc.dev = dev;
874 desc.name = dev_name(dev);
874 desc.groups = coresight_stm_groups;875 desc.groups = coresight_stm_groups;
875 drvdata->csdev = coresight_register(&desc);876 drvdata->csdev = coresight_register(&desc);
876 if (IS_ERR(drvdata->csdev)) {877 if (IS_ERR(drvdata->csdev)) {
drivers/hwtracing/coresight/coresight-tmc.c+3−2
@@ -437,6 +437,7 @@ static int tmc_probe(struct amba_device *adev, const struct amba_id *id) · 436 unmodified lines
437 desc.pdata = pdata;437 desc.pdata = pdata;
438 desc.dev = dev;438 desc.dev = dev;
439 desc.groups = coresight_tmc_groups;439 desc.groups = coresight_tmc_groups;
440 desc.name = dev_name(dev);
440 441
441 switch (drvdata->config_type) {442 switch (drvdata->config_type) {
442 case TMC_CONFIG_TYPE_ETB:443 case TMC_CONFIG_TYPE_ETB:
@@ -461,7 +462,7 @@ static int tmc_probe(struct amba_device *adev, const struct amba_id *id) · 18 unmodified lines
461 desc.ops = &tmc_etf_cs_ops;462 desc.ops = &tmc_etf_cs_ops;
462 break;463 break;
463 default:464 default:
464 pr_err("%s: Unsupported TMC config\n", pdata->name);465 pr_err("%s: Unsupported TMC config\n", desc.name);
465 ret = -EINVAL;466 ret = -EINVAL;
466 goto out;467 goto out;
467 }468 }
@@ -472,7 +473,7 @@ static int tmc_probe(struct amba_device *adev, const struct amba_id *id) · 4 unmodified lines
472 goto out;473 goto out;
473 }474 }
474 475
475 drvdata->miscdev.name = pdata->name;476 drvdata->miscdev.name = desc.name;
476 drvdata->miscdev.minor = MISC_DYNAMIC_MINOR;477 drvdata->miscdev.minor = MISC_DYNAMIC_MINOR;
477 drvdata->miscdev.fops = &tmc_fops;478 drvdata->miscdev.fops = &tmc_fops;
478 ret = misc_register(&drvdata->miscdev);479 ret = misc_register(&drvdata->miscdev);
drivers/hwtracing/coresight/coresight-tpiu.c+1−0
@@ -157,6 +157,7 @@ static int tpiu_probe(struct amba_device *adev, const struct amba_id *id) · 156 unmodified lines
157 desc.ops = &tpiu_cs_ops;157 desc.ops = &tpiu_cs_ops;
158 desc.pdata = pdata;158 desc.pdata = pdata;
159 desc.dev = dev;159 desc.dev = dev;
160 desc.name = dev_name(dev);
160 drvdata->csdev = coresight_register(&desc);161 drvdata->csdev = coresight_register(&desc);
161 162
162 if (!IS_ERR(drvdata->csdev)) {163 if (!IS_ERR(drvdata->csdev)) {
drivers/hwtracing/coresight/coresight.c+1−1
@@ -1199,7 +1199,7 @@ struct coresight_device *coresight_register(struct coresight_desc *desc) · 1198 unmodified lines
1199 csdev->dev.parent = desc->dev;1199 csdev->dev.parent = desc->dev;
1200 csdev->dev.release = coresight_device_release;1200 csdev->dev.release = coresight_device_release;
1201 csdev->dev.bus = &coresight_bustype;1201 csdev->dev.bus = &coresight_bustype;
1202 dev_set_name(&csdev->dev, "%s", desc->pdata->name);1202 dev_set_name(&csdev->dev, "%s", desc->name);
1203 1203
1204 ret = device_register(&csdev->dev);1204 ret = device_register(&csdev->dev);
1205 if (ret) {1205 if (ret) {
include/linux/coresight.h+4−4
@@ -91,13 +91,11 @@ union coresight_dev_subtype { · 90 unmodified lines
91 91
92/**92/**
93 * struct coresight_platform_data - data harvested from the DT specification93 * struct coresight_platform_data - data harvested from the DT specification
94 * @name: name of the component as shown under sysfs.
95 * @nr_inport: number of input ports for this component.94 * @nr_inport: number of input ports for this component.
96 * @nr_outport: number of output ports for this component.95 * @nr_outport: number of output ports for this component.
97 * @conns: Array of nr_outport connections from this component96 * @conns: Array of nr_outport connections from this component
98 */97 */
99struct coresight_platform_data {98struct coresight_platform_data {
100 const char *name;
101 int nr_inport;99 int nr_inport;
102 int nr_outport;100 int nr_outport;
103 struct coresight_connection *conns;101 struct coresight_connection *conns;
@@ -108,11 +106,12 @@ struct coresight_platform_data { · 4 unmodified lines
108 * @type: as defined by @coresight_dev_type.106 * @type: as defined by @coresight_dev_type.
109 * @subtype: as defined by @coresight_dev_subtype.107 * @subtype: as defined by @coresight_dev_subtype.
110 * @ops: generic operations for this component, as defined108 * @ops: generic operations for this component, as defined
111 by @coresight_ops.109 * by @coresight_ops.
112 * @pdata: platform data collected from DT.110 * @pdata: platform data collected from DT.
113 * @dev: The device entity associated to this component.111 * @dev: The device entity associated to this component.
114 * @groups: operations specific to this component. These will end up112 * @groups: operations specific to this component. These will end up
115 in the component's sysfs sub-directory.113 * in the component's sysfs sub-directory.
114 * @name: name for the coresight device, also shown under sysfs.
116 */115 */
117struct coresight_desc {116struct coresight_desc {
118 enum coresight_dev_type type;117 enum coresight_dev_type type;
@@ -121,6 +120,7 @@ struct coresight_desc { · 2 unmodified lines
121 struct coresight_platform_data *pdata;120 struct coresight_platform_data *pdata;
122 struct device *dev;121 struct device *dev;
123 const struct attribute_group **groups;122 const struct attribute_group **groups;
123 const char *name;
124};124};
125 125
126/**126/**

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t