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.
Showing the changes to include/linux (1 of 12 files). Show all
Unified · Split
| @@ -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 specification | 93 | * 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 component | 96 | * @conns: Array of nr_outport connections from this component |
| 98 | */ | 97 | */ |
| 99 | struct coresight_platform_data { | 98 | struct 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 defined | 108 | * @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 up | 112 | * @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 | */ |
| 117 | struct coresight_desc { | 116 | struct 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 | /** |