2023-05-16 20:30:26

by Yazen Ghannam

Subject: [PATCH 6/6] 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 <[email protected]>
---
drivers/hwmon/k10temp.c | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/drivers/hwmon/k10temp.c b/drivers/hwmon/k10temp.c
index 06af1fe38af7..873dbe0f5806 100644
--- a/drivers/hwmon/k10temp.c
+++ b/drivers/hwmon/k10temp.c
@@ -379,8 +379,7 @@ static const struct hwmon_chip_info k10temp_chip_info = {
.info = k10temp_info,
};

-static void k10temp_get_ccd_support(struct pci_dev *pdev,
- struct k10temp_data *data, int limit)
+static void k10temp_get_ccd_support(struct k10temp_data *data, int limit)
{
u32 regval;
int i;
@@ -435,18 +434,18 @@ static int k10temp_probe(struct pci_dev *pdev, const struct pci_device_id *id)
case 0x11: /* Zen APU */
case 0x18: /* Zen+ APU */
data->ccd_offset = 0x154;
- k10temp_get_ccd_support(pdev, data, 4);
+ k10temp_get_ccd_support(data, 4);
break;
case 0x31: /* Zen2 Threadripper */
case 0x60: /* Renoir */
case 0x68: /* Lucienne */
case 0x71: /* Zen2 */
data->ccd_offset = 0x154;
- k10temp_get_ccd_support(pdev, data, 8);
+ k10temp_get_ccd_support(data, 8);
break;
case 0xa0 ... 0xaf:
data->ccd_offset = 0x300;
- k10temp_get_ccd_support(pdev, data, 8);
+ k10temp_get_ccd_support(data, 8);
break;
}
} else if (boot_cpu_data.x86 == 0x19) {
@@ -459,21 +458,21 @@ static int k10temp_probe(struct pci_dev *pdev, const struct pci_device_id *id)
case 0x21: /* Zen3 Ryzen Desktop */
case 0x50 ... 0x5f: /* Green Sardine */
data->ccd_offset = 0x154;
- k10temp_get_ccd_support(pdev, data, 8);
+ k10temp_get_ccd_support(data, 8);
break;
case 0x40 ... 0x4f: /* Yellow Carp */
data->ccd_offset = 0x300;
- k10temp_get_ccd_support(pdev, data, 8);
+ k10temp_get_ccd_support(data, 8);
break;
case 0x60 ... 0x6f:
case 0x70 ... 0x7f:
data->ccd_offset = 0x308;
- k10temp_get_ccd_support(pdev, data, 8);
+ k10temp_get_ccd_support(data, 8);
break;
case 0x10 ... 0x1f:
case 0xa0 ... 0xaf:
data->ccd_offset = 0x300;
- k10temp_get_ccd_support(pdev, data, 12);
+ k10temp_get_ccd_support(data, 12);
break;
}
} else {
--
2.34.1

2023-05-17 12:46:24

by Guenter Roeck

Subject: Re: [PATCH 6/6] hwmon: (k10temp) Reduce k10temp_get_ccd_support() parameters

On Tue, May 16, 2023 at 03:24:30PM -0500, Yazen Ghannam wrote:
> 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 <[email protected]>

Acked-by: Guenter Roeck <[email protected]>

> ---
> drivers/hwmon/k10temp.c | 17 ++++++++---------
> 1 file changed, 8 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/hwmon/k10temp.c b/drivers/hwmon/k10temp.c
> index 06af1fe38af7..873dbe0f5806 100644
> --- a/drivers/hwmon/k10temp.c
> +++ b/drivers/hwmon/k10temp.c
> @@ -379,8 +379,7 @@ static const struct hwmon_chip_info k10temp_chip_info = {
> .info = k10temp_info,
> };
>
> -static void k10temp_get_ccd_support(struct pci_dev *pdev,
> - struct k10temp_data *data, int limit)
> +static void k10temp_get_ccd_support(struct k10temp_data *data, int limit)
> {
> u32 regval;
> int i;
> @@ -435,18 +434,18 @@ static int k10temp_probe(struct pci_dev *pdev, const struct pci_device_id *id)
> case 0x11: /* Zen APU */
> case 0x18: /* Zen+ APU */
> data->ccd_offset = 0x154;
> - k10temp_get_ccd_support(pdev, data, 4);
> + k10temp_get_ccd_support(data, 4);
> break;
> case 0x31: /* Zen2 Threadripper */
> case 0x60: /* Renoir */
> case 0x68: /* Lucienne */
> case 0x71: /* Zen2 */
> data->ccd_offset = 0x154;
> - k10temp_get_ccd_support(pdev, data, 8);
> + k10temp_get_ccd_support(data, 8);
> break;
> case 0xa0 ... 0xaf:
> data->ccd_offset = 0x300;
> - k10temp_get_ccd_support(pdev, data, 8);
> + k10temp_get_ccd_support(data, 8);
> break;
> }
> } else if (boot_cpu_data.x86 == 0x19) {
> @@ -459,21 +458,21 @@ static int k10temp_probe(struct pci_dev *pdev, const struct pci_device_id *id)
> case 0x21: /* Zen3 Ryzen Desktop */
> case 0x50 ... 0x5f: /* Green Sardine */
> data->ccd_offset = 0x154;
> - k10temp_get_ccd_support(pdev, data, 8);
> + k10temp_get_ccd_support(data, 8);
> break;
> case 0x40 ... 0x4f: /* Yellow Carp */
> data->ccd_offset = 0x300;
> - k10temp_get_ccd_support(pdev, data, 8);
> + k10temp_get_ccd_support(data, 8);
> break;
> case 0x60 ... 0x6f:
> case 0x70 ... 0x7f:
> data->ccd_offset = 0x308;
> - k10temp_get_ccd_support(pdev, data, 8);
> + k10temp_get_ccd_support(data, 8);
> break;
> case 0x10 ... 0x1f:
> case 0xa0 ... 0xaf:
> data->ccd_offset = 0x300;
> - k10temp_get_ccd_support(pdev, data, 12);
> + k10temp_get_ccd_support(data, 12);
> break;
> }
> } else {
> --
> 2.34.1
>