Skip to content

Commit 20d0ac8

Browse files
committed
hwmon: (k10temp) Reduce k10temp_get_ccd_support() parameters
JIRA: https://issues.redhat.com/browse/RHEL-104300 commit a8bc416 Author: Yazen Ghannam <yazen.ghannam@amd.com> Date: Thu Jun 6 11:12:59 2024 -0500 hwmon: (k10temp) Reduce k10temp_get_ccd_support() parameters Currently, k10temp_get_ccd_support() takes as input "pdev" and "data". However, "pdev" is already included in "data". Furthermore, the "pdev" parameter is no longer used in k10temp_get_ccd_support(), since its use was moved into read_ccd_temp_reg(). Drop the "pdev" input parameter as it is no longer needed. No functional change is intended. Signed-off-by: Yazen Ghannam <yazen.ghannam@amd.com> Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de> Reviewed-by: Mario Limonciello <mario.limonciello@amd.com> Acked-by: Guenter Roeck <linux@roeck-us.net> Link: https://lore.kernel.org/r/20240606-fix-smn-bad-read-v4-6-ffde21931c3f@amd.com Signed-off-by: David Arcari <darcari@redhat.com>
1 parent f763c0c commit 20d0ac8

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

drivers/hwmon/k10temp.c

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -390,8 +390,7 @@ static const struct hwmon_chip_info k10temp_chip_info = {
390390
.info = k10temp_info,
391391
};
392392

393-
static void k10temp_get_ccd_support(struct pci_dev *pdev,
394-
struct k10temp_data *data, int limit)
393+
static void k10temp_get_ccd_support(struct k10temp_data *data, int limit)
395394
{
396395
u32 regval;
397396
int i;
@@ -461,18 +460,18 @@ static int k10temp_probe(struct pci_dev *pdev, const struct pci_device_id *id)
461460
case 0x11: /* Zen APU */
462461
case 0x18: /* Zen+ APU */
463462
data->ccd_offset = 0x154;
464-
k10temp_get_ccd_support(pdev, data, 4);
463+
k10temp_get_ccd_support(data, 4);
465464
break;
466465
case 0x31: /* Zen2 Threadripper */
467466
case 0x60: /* Renoir */
468467
case 0x68: /* Lucienne */
469468
case 0x71: /* Zen2 */
470469
data->ccd_offset = 0x154;
471-
k10temp_get_ccd_support(pdev, data, 8);
470+
k10temp_get_ccd_support(data, 8);
472471
break;
473472
case 0xa0 ... 0xaf:
474473
data->ccd_offset = 0x300;
475-
k10temp_get_ccd_support(pdev, data, 8);
474+
k10temp_get_ccd_support(data, 8);
476475
break;
477476
}
478477
} else if (boot_cpu_data.x86 == 0x19) {
@@ -486,21 +485,21 @@ static int k10temp_probe(struct pci_dev *pdev, const struct pci_device_id *id)
486485
case 0x21: /* Zen3 Ryzen Desktop */
487486
case 0x50 ... 0x5f: /* Green Sardine */
488487
data->ccd_offset = 0x154;
489-
k10temp_get_ccd_support(pdev, data, 8);
488+
k10temp_get_ccd_support(data, 8);
490489
break;
491490
case 0x40 ... 0x4f: /* Yellow Carp */
492491
data->ccd_offset = 0x300;
493-
k10temp_get_ccd_support(pdev, data, 8);
492+
k10temp_get_ccd_support(data, 8);
494493
break;
495494
case 0x60 ... 0x6f:
496495
case 0x70 ... 0x7f:
497496
data->ccd_offset = 0x308;
498-
k10temp_get_ccd_support(pdev, data, 8);
497+
k10temp_get_ccd_support(data, 8);
499498
break;
500499
case 0x10 ... 0x1f:
501500
case 0xa0 ... 0xaf:
502501
data->ccd_offset = 0x300;
503-
k10temp_get_ccd_support(pdev, data, 12);
502+
k10temp_get_ccd_support(data, 12);
504503
break;
505504
}
506505
} else if (boot_cpu_data.x86 == 0x1a) {

0 commit comments

Comments
 (0)