platform/x86: mlx-platform: Fix item counter assignment for MSN2700, MSN24xx systems
authorVadim Pasternak <vadimp@nvidia.com>
Mon, 7 Dec 2020 17:47:44 +0000 (19:47 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 30 Dec 2020 10:53:42 +0000 (11:53 +0100)
[ Upstream commit ba4939f1dd46dde08c2f9b9d7ac86ed3ea7ead86 ]

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: c6acad68eb2d ("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>
drivers/platform/x86/mlx-platform.c

index 598f4455876499513428cc397572ef25d7099e10..902424e06180c9ab493d844aa8023318c4f3f753 100644 (file)
@@ -465,7 +465,7 @@ static struct mlxreg_core_item mlxplat_mlxcpld_default_items[] = {
                .aggr_mask = MLXPLAT_CPLD_AGGR_PWR_MASK_DEF,
                .reg = MLXPLAT_CPLD_LPC_REG_PWR_OFFSET,
                .mask = MLXPLAT_CPLD_PWR_MASK,
-               .count = ARRAY_SIZE(mlxplat_mlxcpld_pwr),
+               .count = ARRAY_SIZE(mlxplat_mlxcpld_default_pwr_items_data),
                .inversed = 0,
                .health = false,
        },
@@ -474,7 +474,7 @@ static struct mlxreg_core_item mlxplat_mlxcpld_default_items[] = {
                .aggr_mask = MLXPLAT_CPLD_AGGR_FAN_MASK_DEF,
                .reg = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET,
                .mask = MLXPLAT_CPLD_FAN_MASK,
-               .count = ARRAY_SIZE(mlxplat_mlxcpld_fan),
+               .count = ARRAY_SIZE(mlxplat_mlxcpld_default_fan_items_data),
                .inversed = 1,
                .health = false,
        },