Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp9112553pxu; Mon, 28 Dec 2020 06:59:11 -0800 (PST) X-Google-Smtp-Source: ABdhPJwwYN44f+DWyIzeZahrdLlSBFZmNCr+0xna3tLuhjCY+VMNIhi945Bu651brggcSRFezfNL X-Received: by 2002:a17:906:edb2:: with SMTP id sa18mr40182907ejb.264.1609167551432; Mon, 28 Dec 2020 06:59:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1609167551; cv=none; d=google.com; s=arc-20160816; b=UZSfpbh4vOKIBYMFAy4tOvSqkY23mXGnaXpFjagrYgnLOt7ePpGqLLa40cDzwsoZtP UJOZ1EzV/VH9licSCBTPQhvXXwG3PmW9jxvaz+qWSl0zk2D7W76GubgQpiWvOcGgzkPU ICi9aPifqOUC4+vHs56SBchdgya3wq323okv2nZ/ioA9HywF7RhLE+Qxb40nG6e17JMX 9di2x5826+mmy+sz27MAF3e0HVbV0xi/Q2jZgAmfj4pJNswUjbnoRn9+iwuijku4LxmG uWRNzp8G+/w7D+0saun8L9EFOKTPAedGzES4BEkmxK6uP/cttgkfStrlRgrUr2Z2vGk7 1lmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=2lgI6X9reU+950VEXyJ2G9dO4d9y0bve05hDDOlX1O8=; b=z7QohD5PYxAicIKcwb13nhmRUE48pCL3V/9686aqtD2UDZGRAzem/ybu1qyN0sT50T 8bH/ypvOG0A910RTn+mqGzTLtubGQ8zHcRVw0mvnlY736JKaa3uamqbVhzMu+yWIdegh M/80qz6xFp9SSJNWiQd+qyOSwmkbq+gPa7GJCCmu35IDtbjxLRyBcTLOnfJeDQa4Bh1x JeI1xIvZuMTPxjvOJUIrppKqeOBJQRKHPMLMITmSmulxhRhNCVceFK3WaGgiaJX5g2Qd TLu1nkASyN75nVbGRg8y2BxndwNuNkepa6b7+z2MmbRMIkSBTPqavQFqBMiVMXmYYcNm VN7Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=kSe9Fw+o; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id pk26si17695649ejb.584.2020.12.28.06.58.46; Mon, 28 Dec 2020 06:59:11 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=kSe9Fw+o; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2441328AbgL1ORB (ORCPT + 99 others); Mon, 28 Dec 2020 09:17:01 -0500 Received: from mail.kernel.org ([198.145.29.99]:51890 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2441226AbgL1OQl (ORCPT ); Mon, 28 Dec 2020 09:16:41 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id A12D4224D2; Mon, 28 Dec 2020 14:16:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1609164961; bh=6NUQfFcG03f7O66ImdpoJiKW22X+jMROlqTRRLmSNrY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kSe9Fw+oef8du/iCw9mWweSwZ5fHhVHxv9b1tSP9FpB1AKghl8cDVy54q9LU1lPxC +DeWVYfAscxVPStyUy8eoOU9QzsTABWYGgMqTMgpTgld3woASNMZHU60EAz4vUwtdm redT0Y8LORaP1FW/i7aeRpPaElvuV/1P5CSD3O4I= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Vadim Pasternak , Hans de Goede , Sasha Levin Subject: [PATCH 5.10 361/717] platform/x86: mlx-platform: Fix item counter assignment for MSN2700, MSN24xx systems Date: Mon, 28 Dec 2020 13:45:59 +0100 Message-Id: <20201228125038.309393286@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201228125020.963311703@linuxfoundation.org> References: <20201228125020.963311703@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Vadim Pasternak [ 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 Link: https://lore.kernel.org/r/20201207174745.22889-2-vadimp@nvidia.com Signed-off-by: Hans de Goede Signed-off-by: Sasha Levin --- 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 598f445587649..902424e06180c 100644 --- a/drivers/platform/x86/mlx-platform.c +++ b/drivers/platform/x86/mlx-platform.c @@ -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, }, -- 2.27.0