Skip to content

Commit acc6ea3

Browse files
vadimp-nvidiajwrdegoede
authored andcommitted
platform: mellanox: Cosmetic changes - rename to more common name
Rename 'nvlink_blade' in several declaration to more common name "chassis_blade", since these names are going to be used for different kinds of blades. Fix 'swicth' to 'switch' in comment. Signed-off-by: Vadim Pasternak <[email protected]> Reviewed-by: Michael Shych <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Hans de Goede <[email protected]>
1 parent 488f0fc commit acc6ea3

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

drivers/platform/x86/mlx-platform.c

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -473,7 +473,7 @@ static struct i2c_mux_reg_platform_data mlxplat_modular_mux_data[] = {
473473
},
474474
};
475475

476-
/* Platform channels for rack swicth system family */
476+
/* Platform channels for rack switch system family */
477477
static const int mlxplat_rack_switch_channels[] = {
478478
1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
479479
};
@@ -2085,7 +2085,7 @@ static struct mlxreg_core_data mlxplat_mlxcpld_global_wp_items_data[] = {
20852085
},
20862086
};
20872087

2088-
static struct mlxreg_core_item mlxplat_mlxcpld_nvlink_blade_items[] = {
2088+
static struct mlxreg_core_item mlxplat_mlxcpld_chassis_blade_items[] = {
20892089
{
20902090
.data = mlxplat_mlxcpld_global_wp_items_data,
20912091
.aggr_mask = MLXPLAT_CPLD_AGGR_MASK_NG_DEF,
@@ -2098,9 +2098,9 @@ static struct mlxreg_core_item mlxplat_mlxcpld_nvlink_blade_items[] = {
20982098
};
20992099

21002100
static
2101-
struct mlxreg_core_hotplug_platform_data mlxplat_mlxcpld_nvlink_blade_data = {
2102-
.items = mlxplat_mlxcpld_nvlink_blade_items,
2103-
.counter = ARRAY_SIZE(mlxplat_mlxcpld_nvlink_blade_items),
2101+
struct mlxreg_core_hotplug_platform_data mlxplat_mlxcpld_chassis_blade_data = {
2102+
.items = mlxplat_mlxcpld_chassis_blade_items,
2103+
.counter = ARRAY_SIZE(mlxplat_mlxcpld_chassis_blade_items),
21042104
.cell = MLXPLAT_CPLD_LPC_REG_AGGR_OFFSET,
21052105
.mask = MLXPLAT_CPLD_AGGR_MASK_COMEX,
21062106
.cell_low = MLXPLAT_CPLD_LPC_REG_AGGRLO_OFFSET,
@@ -3848,8 +3848,8 @@ static struct mlxreg_core_platform_data mlxplat_modular_regs_io_data = {
38483848
.counter = ARRAY_SIZE(mlxplat_mlxcpld_modular_regs_io_data),
38493849
};
38503850

3851-
/* Platform register access for NVLink blade systems family data */
3852-
static struct mlxreg_core_data mlxplat_mlxcpld_nvlink_blade_regs_io_data[] = {
3851+
/* Platform register access for chassis blade systems family data */
3852+
static struct mlxreg_core_data mlxplat_mlxcpld_chassis_blade_regs_io_data[] = {
38533853
{
38543854
.label = "cpld1_version",
38553855
.reg = MLXPLAT_CPLD_LPC_REG_CPLD1_VER_OFFSET,
@@ -4046,9 +4046,9 @@ static struct mlxreg_core_data mlxplat_mlxcpld_nvlink_blade_regs_io_data[] = {
40464046
},
40474047
};
40484048

4049-
static struct mlxreg_core_platform_data mlxplat_nvlink_blade_regs_io_data = {
4050-
.data = mlxplat_mlxcpld_nvlink_blade_regs_io_data,
4051-
.counter = ARRAY_SIZE(mlxplat_mlxcpld_nvlink_blade_regs_io_data),
4049+
static struct mlxreg_core_platform_data mlxplat_chassis_blade_regs_io_data = {
4050+
.data = mlxplat_mlxcpld_chassis_blade_regs_io_data,
4051+
.counter = ARRAY_SIZE(mlxplat_mlxcpld_chassis_blade_regs_io_data),
40524052
};
40534053

40544054
/* Platform FAN default */
@@ -5168,22 +5168,22 @@ static int __init mlxplat_dmi_modular_matched(const struct dmi_system_id *dmi)
51685168
return 1;
51695169
}
51705170

5171-
static int __init mlxplat_dmi_nvlink_blade_matched(const struct dmi_system_id *dmi)
5171+
static int __init mlxplat_dmi_chassis_blade_matched(const struct dmi_system_id *dmi)
51725172
{
51735173
int i;
51745174

51755175
mlxplat_max_adap_num = MLXPLAT_CPLD_MAX_PHYS_ADAPTER_NUM;
51765176
mlxplat_mux_num = ARRAY_SIZE(mlxplat_default_mux_data);
51775177
mlxplat_mux_data = mlxplat_default_mux_data;
5178-
mlxplat_hotplug = &mlxplat_mlxcpld_nvlink_blade_data;
5178+
mlxplat_hotplug = &mlxplat_mlxcpld_chassis_blade_data;
51795179
mlxplat_hotplug->deferred_nr =
51805180
mlxplat_msn21xx_channels[MLXPLAT_CPLD_GRP_CHNL_NUM - 1];
51815181
for (i = 0; i < mlxplat_mux_num; i++) {
51825182
mlxplat_mux_data[i].values = mlxplat_msn21xx_channels;
51835183
mlxplat_mux_data[i].n_values =
51845184
ARRAY_SIZE(mlxplat_msn21xx_channels);
51855185
}
5186-
mlxplat_regs_io = &mlxplat_nvlink_blade_regs_io_data;
5186+
mlxplat_regs_io = &mlxplat_chassis_blade_regs_io_data;
51875187
mlxplat_i2c = &mlxplat_mlxcpld_i2c_ng_data;
51885188
mlxplat_regmap_config = &mlxplat_mlxcpld_regmap_config_ng400;
51895189

@@ -5288,7 +5288,7 @@ static const struct dmi_system_id mlxplat_dmi_table[] __initconst = {
52885288
},
52895289
},
52905290
{
5291-
.callback = mlxplat_dmi_nvlink_blade_matched,
5291+
.callback = mlxplat_dmi_chassis_blade_matched,
52925292
.matches = {
52935293
DMI_MATCH(DMI_BOARD_NAME, "VMOD0015"),
52945294
},

0 commit comments

Comments
 (0)