lkml.org 
[lkml]   [2020]   [Dec]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 244/453] platform/x86: mlx-platform: Fix item counter assignment for MSN2700, MSN24xx systems
    Date
    From: Vadim Pasternak <vadimp@nvidia.com>

    [ 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 | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/platform/x86/mlx-platform.c b/drivers/platform/x86/mlx-platform.c
    index 4b3d94c4a939a..acb094ddf8e61 100644
    --- a/drivers/platform/x86/mlx-platform.c
    +++ b/drivers/platform/x86/mlx-platform.c
    @@ -355,7 +355,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,
    },
    @@ -364,7 +364,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,
    },
    --
    2.27.0


    \
     
     \ /
      Last update: 2020-12-28 15:10    [W:2.080 / U:0.072 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site