platform/mellanox: Rename field to improve code readability

Rename field 'counter' in 'mlxreg_core_hotplug_platform_data' to count.

Signed-off-by: Vadim Pasternak <vadimp@nvidia.com>
Link: https://lore.kernel.org/r/20250412091843.33943-2-vadimp@nvidia.com
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>

diff --git a/drivers/platform/mellanox/mlx-platform.c b/drivers/platform/mellanox/mlx-platform.c
index 08b0430a2899a07f78d3407cd1d2309f295f8d93..cc19349d301b15da81f7a033b3a0d24138029d2d 100644 (file)
--- a/drivers/platform/mellanox/mlx-platform.c
+++ b/drivers/platform/mellanox/mlx-platform.c
@@ -852,7 +852,7 @@ static struct mlxreg_core_item mlxplat_mlxcpld_comex_items[] = {
 static
 struct mlxreg_core_hotplug_platform_data mlxplat_mlxcpld_default_data = {
        .items = mlxplat_mlxcpld_default_items,
-       .counter = ARRAY_SIZE(mlxplat_mlxcpld_default_items),
+       .count = ARRAY_SIZE(mlxplat_mlxcpld_default_items),
        .cell = MLXPLAT_CPLD_LPC_REG_AGGR_OFFSET,
        .mask = MLXPLAT_CPLD_AGGR_MASK_DEF,
        .cell_low = MLXPLAT_CPLD_LPC_REG_AGGRLO_OFFSET,
@@ -892,7 +892,7 @@ static struct mlxreg_core_item mlxplat_mlxcpld_default_wc_items[] = {
 static
 struct mlxreg_core_hotplug_platform_data mlxplat_mlxcpld_default_wc_data = {
        .items = mlxplat_mlxcpld_default_wc_items,
-       .counter = ARRAY_SIZE(mlxplat_mlxcpld_default_wc_items),
+       .count = ARRAY_SIZE(mlxplat_mlxcpld_default_wc_items),
        .cell = MLXPLAT_CPLD_LPC_REG_AGGR_OFFSET,
        .mask = MLXPLAT_CPLD_AGGR_MASK_DEF,
        .cell_low = MLXPLAT_CPLD_LPC_REG_AGGRLO_OFFSET,
@@ -902,7 +902,7 @@ struct mlxreg_core_hotplug_platform_data mlxplat_mlxcpld_default_wc_data = {
 static
 struct mlxreg_core_hotplug_platform_data mlxplat_mlxcpld_comex_data = {
        .items = mlxplat_mlxcpld_comex_items,
-       .counter = ARRAY_SIZE(mlxplat_mlxcpld_comex_items),
+       .count = ARRAY_SIZE(mlxplat_mlxcpld_comex_items),
        .cell = MLXPLAT_CPLD_LPC_REG_AGGR_OFFSET,
        .mask = MLXPLAT_CPLD_AGGR_MASK_CARR_DEF,
        .cell_low = MLXPLAT_CPLD_LPC_REG_AGGRCX_OFFSET,
@@ -949,7 +949,7 @@ static struct mlxreg_core_item mlxplat_mlxcpld_msn21xx_items[] = {
 static
 struct mlxreg_core_hotplug_platform_data mlxplat_mlxcpld_msn21xx_data = {
        .items = mlxplat_mlxcpld_msn21xx_items,
-       .counter = ARRAY_SIZE(mlxplat_mlxcpld_msn21xx_items),
+       .count = ARRAY_SIZE(mlxplat_mlxcpld_msn21xx_items),
        .cell = MLXPLAT_CPLD_LPC_REG_AGGR_OFFSET,
        .mask = MLXPLAT_CPLD_AGGR_MASK_DEF,
        .cell_low = MLXPLAT_CPLD_LPC_REG_AGGRLO_OFFSET,
@@ -1058,7 +1058,7 @@ static struct mlxreg_core_item mlxplat_mlxcpld_msn274x_items[] = {
 static
 struct mlxreg_core_hotplug_platform_data mlxplat_mlxcpld_msn274x_data = {
        .items = mlxplat_mlxcpld_msn274x_items,
-       .counter = ARRAY_SIZE(mlxplat_mlxcpld_msn274x_items),
+       .count = ARRAY_SIZE(mlxplat_mlxcpld_msn274x_items),
        .cell = MLXPLAT_CPLD_LPC_REG_AGGR_OFFSET,
        .mask = MLXPLAT_CPLD_AGGR_MASK_NG_DEF,
        .cell_low = MLXPLAT_CPLD_LPC_REG_AGGRLO_OFFSET,
@@ -1105,7 +1105,7 @@ static struct mlxreg_core_item mlxplat_mlxcpld_msn201x_items[] = {
 static
 struct mlxreg_core_hotplug_platform_data mlxplat_mlxcpld_msn201x_data = {
        .items = mlxplat_mlxcpld_msn201x_items,
-       .counter = ARRAY_SIZE(mlxplat_mlxcpld_msn201x_items),
+       .count = ARRAY_SIZE(mlxplat_mlxcpld_msn201x_items),
        .cell = MLXPLAT_CPLD_LPC_REG_AGGR_OFFSET,
        .mask = MLXPLAT_CPLD_AGGR_MASK_DEF,
        .cell_low = MLXPLAT_CPLD_LPC_REG_AGGRLO_OFFSET,
@@ -1229,7 +1229,7 @@ static struct mlxreg_core_item mlxplat_mlxcpld_default_ng_items[] = {
 static
 struct mlxreg_core_hotplug_platform_data mlxplat_mlxcpld_default_ng_data = {
        .items = mlxplat_mlxcpld_default_ng_items,
-       .counter = ARRAY_SIZE(mlxplat_mlxcpld_default_ng_items),
+       .count = ARRAY_SIZE(mlxplat_mlxcpld_default_ng_items),
        .cell = MLXPLAT_CPLD_LPC_REG_AGGR_OFFSET,
        .mask = MLXPLAT_CPLD_AGGR_MASK_NG_DEF | MLXPLAT_CPLD_AGGR_MASK_COMEX,
        .cell_low = MLXPLAT_CPLD_LPC_REG_AGGRLO_OFFSET,
@@ -1389,7 +1389,7 @@ static struct mlxreg_core_item mlxplat_mlxcpld_ng800_items[] = {
 static
 struct mlxreg_core_hotplug_platform_data mlxplat_mlxcpld_ext_data = {
        .items = mlxplat_mlxcpld_ext_items,
-       .counter = ARRAY_SIZE(mlxplat_mlxcpld_ext_items),
+       .count = ARRAY_SIZE(mlxplat_mlxcpld_ext_items),
        .cell = MLXPLAT_CPLD_LPC_REG_AGGR_OFFSET,
        .mask = MLXPLAT_CPLD_AGGR_MASK_NG_DEF | MLXPLAT_CPLD_AGGR_MASK_COMEX,
        .cell_low = MLXPLAT_CPLD_LPC_REG_AGGRLO_OFFSET,
@@ -1399,7 +1399,7 @@ struct mlxreg_core_hotplug_platform_data mlxplat_mlxcpld_ext_data = {
 static
 struct mlxreg_core_hotplug_platform_data mlxplat_mlxcpld_ng800_data = {
        .items = mlxplat_mlxcpld_ng800_items,
-       .counter = ARRAY_SIZE(mlxplat_mlxcpld_ng800_items),
+       .count = ARRAY_SIZE(mlxplat_mlxcpld_ng800_items),
        .cell = MLXPLAT_CPLD_LPC_REG_AGGR_OFFSET,
        .mask = MLXPLAT_CPLD_AGGR_MASK_NG_DEF | MLXPLAT_CPLD_AGGR_MASK_COMEX,
        .cell_low = MLXPLAT_CPLD_LPC_REG_AGGRLO_OFFSET,
@@ -2240,7 +2240,7 @@ static struct mlxreg_core_item mlxplat_mlxcpld_modular_items[] = {
 static
 struct mlxreg_core_hotplug_platform_data mlxplat_mlxcpld_modular_data = {
        .items = mlxplat_mlxcpld_modular_items,
-       .counter = ARRAY_SIZE(mlxplat_mlxcpld_modular_items),
+       .count = ARRAY_SIZE(mlxplat_mlxcpld_modular_items),
        .cell = MLXPLAT_CPLD_LPC_REG_AGGR_OFFSET,
        .mask = MLXPLAT_CPLD_AGGR_MASK_MODULAR,
        .cell_low = MLXPLAT_CPLD_LPC_REG_AGGRLO_OFFSET,
@@ -2272,7 +2272,7 @@ static struct mlxreg_core_item mlxplat_mlxcpld_chassis_blade_items[] = {
 static
 struct mlxreg_core_hotplug_platform_data mlxplat_mlxcpld_chassis_blade_data = {
        .items = mlxplat_mlxcpld_chassis_blade_items,
-       .counter = ARRAY_SIZE(mlxplat_mlxcpld_chassis_blade_items),
+       .count = ARRAY_SIZE(mlxplat_mlxcpld_chassis_blade_items),
        .cell = MLXPLAT_CPLD_LPC_REG_AGGR_OFFSET,
        .mask = MLXPLAT_CPLD_AGGR_MASK_COMEX,
        .cell_low = MLXPLAT_CPLD_LPC_REG_AGGRLO_OFFSET,
@@ -2363,7 +2363,7 @@ static struct mlxreg_core_item mlxplat_mlxcpld_rack_switch_items[] = {
 static
 struct mlxreg_core_hotplug_platform_data mlxplat_mlxcpld_rack_switch_data = {
        .items = mlxplat_mlxcpld_rack_switch_items,
-       .counter = ARRAY_SIZE(mlxplat_mlxcpld_rack_switch_items),
+       .count = ARRAY_SIZE(mlxplat_mlxcpld_rack_switch_items),
        .cell = MLXPLAT_CPLD_LPC_REG_AGGR_OFFSET,
        .mask = MLXPLAT_CPLD_AGGR_MASK_NG_DEF | MLXPLAT_CPLD_AGGR_MASK_COMEX,
        .cell_low = MLXPLAT_CPLD_LPC_REG_AGGRLO_OFFSET,
@@ -2518,7 +2518,7 @@ static struct mlxreg_core_item mlxplat_mlxcpld_l1_switch_events_items[] = {
 static
 struct mlxreg_core_hotplug_platform_data mlxplat_mlxcpld_l1_switch_data = {
        .items = mlxplat_mlxcpld_l1_switch_events_items,
-       .counter = ARRAY_SIZE(mlxplat_mlxcpld_l1_switch_events_items),
+       .count = ARRAY_SIZE(mlxplat_mlxcpld_l1_switch_events_items),
        .cell = MLXPLAT_CPLD_LPC_REG_AGGR_OFFSET,
        .mask = MLXPLAT_CPLD_AGGR_MASK_NG_DEF | MLXPLAT_CPLD_AGGR_MASK_COMEX,
        .cell_low = MLXPLAT_CPLD_LPC_REG_AGGRLO_OFFSET,

diff --git a/drivers/platform/mellanox/mlxreg-hotplug.c b/drivers/platform/mellanox/mlxreg-hotplug.c
index b347000e4329f2093638373be235514dccb358cc..d246772aafd65c83706bfe68b63a2d7b88245057 100644 (file)
--- a/drivers/platform/mellanox/mlxreg-hotplug.c
+++ b/drivers/platform/mellanox/mlxreg-hotplug.c
@@ -262,7 +262,7 @@ static int mlxreg_hotplug_attr_init(struct mlxreg_hotplug_priv_data *priv)
        item = pdata->items;
 
        /* Go over all kinds of items - psu, pwr, fan. */
-       for (i = 0; i < pdata->counter; i++, item++) {
+       for (i = 0; i < pdata->count; i++, item++) {
                if (item->capability) {
                        /*
                         * Read group capability register to get actual number
@@ -541,7 +541,7 @@ static void mlxreg_hotplug_work_handler(struct work_struct *work)
                goto unmask_event;
 
        /* Handle topology and health configuration changes. */
-       for (i = 0; i < pdata->counter; i++, item++) {
+       for (i = 0; i < pdata->count; i++, item++) {
                if (aggr_asserted & item->aggr_mask) {
                        if (item->health)
                                mlxreg_hotplug_health_work_helper(priv, item);
@@ -590,7 +590,7 @@ static int mlxreg_hotplug_set_irq(struct mlxreg_hotplug_priv_data *priv)
        pdata = dev_get_platdata(&priv->pdev->dev);
        item = pdata->items;
 
-       for (i = 0; i < pdata->counter; i++, item++) {
+       for (i = 0; i < pdata->count; i++, item++) {
                /* Clear group presense event. */
                ret = regmap_write(priv->regmap, item->reg +
                                   MLXREG_HOTPLUG_EVENT_OFF, 0);
@@ -674,7 +674,7 @@ static void mlxreg_hotplug_unset_irq(struct mlxreg_hotplug_priv_data *priv)
                     0);
 
        /* Clear topology configurations. */
-       for (i = 0; i < pdata->counter; i++, item++) {
+       for (i = 0; i < pdata->count; i++, item++) {
                data = item->data;
                /* Mask group presense event. */
                regmap_write(priv->regmap, data->reg + MLXREG_HOTPLUG_MASK_OFF,

diff --git a/drivers/platform/mellanox/nvsw-sn2201.c b/drivers/platform/mellanox/nvsw-sn2201.c
index 0c047aa2345b36add85d34be3bfd74a17c07445c..d0e5a18c0303e2b7125af0c2966f63eb84a68ea0 100644 (file)
--- a/drivers/platform/mellanox/nvsw-sn2201.c
+++ b/drivers/platform/mellanox/nvsw-sn2201.c
@@ -517,7 +517,7 @@ static struct mlxreg_core_item nvsw_sn2201_items[] = {
 static
 struct mlxreg_core_hotplug_platform_data nvsw_sn2201_hotplug = {
        .items = nvsw_sn2201_items,
-       .counter = ARRAY_SIZE(nvsw_sn2201_items),
+       .count = ARRAY_SIZE(nvsw_sn2201_items),
        .cell = NVSW_SN2201_SYS_INT_STATUS_OFFSET,
        .mask = NVSW_SN2201_CPLD_AGGR_MASK_DEF,
 };

diff --git a/include/linux/platform_data/mlxreg.h b/include/linux/platform_data/mlxreg.h
index 0b9f81a6f7533768b741871e4fc16ed2017698dc..f6cca7a035c7869943695c7d1e15f9e0b5e1e8f0 100644 (file)
--- a/include/linux/platform_data/mlxreg.h
+++ b/include/linux/platform_data/mlxreg.h
@@ -209,7 +209,7 @@ struct mlxreg_core_platform_data {
  * @items: same type components with the hotplug capability;
  * @irq: platform interrupt number;
  * @regmap: register map of parent device;
- * @counter: number of the components with the hotplug capability;
+ * @count: number of the components with the hotplug capability;
  * @cell: location of top aggregation interrupt register;
  * @mask: top aggregation interrupt common mask;
  * @cell_low: location of low aggregation interrupt register;
@@ -224,7 +224,7 @@ struct mlxreg_core_hotplug_platform_data {
        struct mlxreg_core_item *items;
        int irq;
        void *regmap;
-       int counter;
+       int count;
        u32 cell;
        u32 mask;
        u32 cell_low;