Received-SPF: Pass (protection.outlook.com: domain of amd.com designates
 165.204.84.17 as permitted sender) receiver=protection.outlook.com;
 client-ip=165.204.84.17; helo=SATLEXMB04.amd.com;
Subject: [PATCH 1/2] hwmon: (k10temp) Move the CCD limit info inside
 k10temp_data structure
From:   Babu Moger <babu.moger@amd.com>
To:     <clemens@ladisch.de>, <jdelvare@suse.com>, <linux@roeck-us.net>
CC:     <linux-hwmon@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Date:   Tue, 23 Nov 2021 15:16:28 -0600
Message-ID: <163770216907.777059.6947726637265961161.stgit@bmoger-ubuntu>
User-Agent: StGit/1.1.dev103+g5369f4c
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Nov 2021 21:16:30.9821
 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: 856ad192-4615-4571-1c35-08d9aec68526
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com]
X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT058.eop-nam11.prod.protection.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Anonymous
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB3390
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

It seems appropriate to move the CCD specific information inside the=0A=
k10temp_data structure.=0A=
=0A=
Signed-off-by: Babu Moger <babu.moger@amd.com>=0A=
---=0A=
Note: Generated the patch on top of hwmon-next.=0A=
=0A=
 drivers/hwmon/k10temp.c |   17 +++++++++++------=0A=
 1 file changed, 11 insertions(+), 6 deletions(-)=0A=
=0A=
diff --git a/drivers/hwmon/k10temp.c b/drivers/hwmon/k10temp.c=0A=
index 880990fa4795..bd436b380a02 100644=0A=
--- a/drivers/hwmon/k10temp.c=0A=
+++ b/drivers/hwmon/k10temp.c=0A=
@@ -85,6 +85,7 @@ struct k10temp_data {=0A=
 	u32 show_temp;=0A=
 	bool is_zen;=0A=
 	u32 ccd_offset;=0A=
+	u32 ccd_limit;=0A=
 };=0A=
 =0A=
 #define TCTL_BIT	0=0A=
@@ -357,12 +358,12 @@ static const struct hwmon_chip_info k10temp_chip_info=
 =3D {=0A=
 };=0A=
 =0A=
 static void k10temp_get_ccd_support(struct pci_dev *pdev,=0A=
-				    struct k10temp_data *data, int limit)=0A=
+				    struct k10temp_data *data)=0A=
 {=0A=
 	u32 regval;=0A=
 	int i;=0A=
 =0A=
-	for (i =3D 0; i < limit; i++) {=0A=
+	for (i =3D 0; i < data->ccd_limit; i++) {=0A=
 		amd_smn_read(amd_pci_dev_to_node_id(pdev),=0A=
 			     ZEN_CCD_TEMP(data->ccd_offset, i), &regval);=0A=
 		if (regval & ZEN_CCD_TEMP_VALID)=0A=
@@ -411,14 +412,16 @@ static int k10temp_probe(struct pci_dev *pdev, const =
struct pci_device_id *id)=0A=
 		case 0x11:	/* Zen APU */=0A=
 		case 0x18:	/* Zen+ APU */=0A=
 			data->ccd_offset =3D 0x154;=0A=
-			k10temp_get_ccd_support(pdev, data, 4);=0A=
+			data->ccd_limit =3D 4;=0A=
+			k10temp_get_ccd_support(pdev, data);=0A=
 			break;=0A=
 		case 0x31:	/* Zen2 Threadripper */=0A=
 		case 0x60:	/* Renoir */=0A=
 		case 0x68:	/* Lucienne */=0A=
 		case 0x71:	/* Zen2 */=0A=
 			data->ccd_offset =3D 0x154;=0A=
-			k10temp_get_ccd_support(pdev, data, 8);=0A=
+			data->ccd_limit =3D 8;=0A=
+			k10temp_get_ccd_support(pdev, data);=0A=
 			break;=0A=
 		}=0A=
 	} else if (boot_cpu_data.x86 =3D=3D 0x19) {=0A=
@@ -431,13 +434,15 @@ static int k10temp_probe(struct pci_dev *pdev, const =
struct pci_device_id *id)=0A=
 		case 0x21:		/* Zen3 Ryzen Desktop */=0A=
 		case 0x50 ... 0x5f:	/* Green Sardine */=0A=
 			data->ccd_offset =3D 0x154;=0A=
-			k10temp_get_ccd_support(pdev, data, 8);=0A=
+			data->ccd_limit =3D 8;=0A=
+			k10temp_get_ccd_support(pdev, data);=0A=
 			break;=0A=
 		case 0x10 ... 0x1f:=0A=
 		case 0x40 ... 0x4f:	/* Yellow Carp */=0A=
 		case 0xa0 ... 0xaf:=0A=
 			data->ccd_offset =3D 0x300;=0A=
-			k10temp_get_ccd_support(pdev, data, 8);=0A=
+			data->ccd_limit =3D 8;=0A=
+			k10temp_get_ccd_support(pdev, data);=0A=
 			break;=0A=
 		}=0A=
 	} else {=0A=
=0A=