Skip to content

Commit 594e3ee

Browse files
vadimp-nvidiaksacilotto
authored andcommitted
platform/x86: mlx-platform: Fix item counter assignment for MSN2700, MSN24xx systems
BugLink: https://bugs.launchpad.net/bugs/1910822 [ Upstream commit ba4939f ] Fix array names to match assignments for data items and data items counter in 'mlxplat_mlxcpld_default_items' structure for: .data = mlxplat_mlxcpld_default_pwr_items_data, .count = ARRAY_SIZE(mlxplat_mlxcpld_pwr), and .data = mlxplat_mlxcpld_default_fan_items_data, .count = ARRAY_SIZE(mlxplat_mlxcpld_fan), Replace: - 'mlxplat_mlxcpld_pwr' by 'mlxplat_mlxcpld_default_pwr_items_data' for ARRAY_SIZE() calculation. - 'mlxplat_mlxcpld_fan' by 'mlxplat_mlxcpld_default_fan_items_data' for ARRAY_SIZE() calculation. Fixes: c6acad6 ("platform/mellanox: mlxreg-hotplug: Modify to use a regmap interface") Signed-off-by: Vadim Pasternak <vadimp@nvidia.com> Link: https://lore.kernel.org/r/20201207174745.22889-2-vadimp@nvidia.com Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Sasha Levin <sashal@kernel.org> Signed-off-by: Kamal Mostafa <kamal@canonical.com> Signed-off-by: Kelsey Skunberg <kelsey.skunberg@canonical.com>
1 parent 34a7f5c commit 594e3ee

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/platform/x86/mlx-platform.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ static struct mlxreg_core_item mlxplat_mlxcpld_default_items[] = {
355355
.aggr_mask = MLXPLAT_CPLD_AGGR_PWR_MASK_DEF,
356356
.reg = MLXPLAT_CPLD_LPC_REG_PWR_OFFSET,
357357
.mask = MLXPLAT_CPLD_PWR_MASK,
358-
.count = ARRAY_SIZE(mlxplat_mlxcpld_pwr),
358+
.count = ARRAY_SIZE(mlxplat_mlxcpld_default_pwr_items_data),
359359
.inversed = 0,
360360
.health = false,
361361
},
@@ -364,7 +364,7 @@ static struct mlxreg_core_item mlxplat_mlxcpld_default_items[] = {
364364
.aggr_mask = MLXPLAT_CPLD_AGGR_FAN_MASK_DEF,
365365
.reg = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET,
366366
.mask = MLXPLAT_CPLD_FAN_MASK,
367-
.count = ARRAY_SIZE(mlxplat_mlxcpld_fan),
367+
.count = ARRAY_SIZE(mlxplat_mlxcpld_default_fan_items_data),
368368
.inversed = 1,
369369
.health = false,
370370
},

0 commit comments

Comments
 (0)