| Message ID | 163640828776.955062.15863375803675701204.stgit@bmoger-ubuntu (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | k10temp/amd_nb: Add support for AMD Family 19h Models 10h-1Fh and A0h-AFh | expand |
On Mon, Nov 08, 2021 at 03:51:27PM -0600, Babu Moger wrote: > Usage of these definitions were removed after the commit 0a4e668b5d52 > ("hwmon: (k10temp) Remove support for displaying voltage and current on Zen CPUs"). > So, cleanup them up. > > Signed-off-by: Babu Moger <babu.moger@amd.com> Applied to hwmon-next. Thanks, Guenter > --- > drivers/hwmon/k10temp.c | 20 -------------------- > 1 file changed, 20 deletions(-) > > diff --git a/drivers/hwmon/k10temp.c b/drivers/hwmon/k10temp.c > index 3618a924e78e..662bad7ed0a2 100644 > --- a/drivers/hwmon/k10temp.c > +++ b/drivers/hwmon/k10temp.c > @@ -76,26 +76,6 @@ static DEFINE_MUTEX(nb_smu_ind_mutex); > #define ZEN_CUR_TEMP_SHIFT 21 > #define ZEN_CUR_TEMP_RANGE_SEL_MASK BIT(19) > > -#define ZEN_SVI_BASE 0x0005A000 > - > -/* F17h thermal registers through SMN */ > -#define F17H_M01H_SVI_TEL_PLANE0 (ZEN_SVI_BASE + 0xc) > -#define F17H_M01H_SVI_TEL_PLANE1 (ZEN_SVI_BASE + 0x10) > -#define F17H_M31H_SVI_TEL_PLANE0 (ZEN_SVI_BASE + 0x14) > -#define F17H_M31H_SVI_TEL_PLANE1 (ZEN_SVI_BASE + 0x10) > - > -#define F17H_M01H_CFACTOR_ICORE 1000000 /* 1A / LSB */ > -#define F17H_M01H_CFACTOR_ISOC 250000 /* 0.25A / LSB */ > -#define F17H_M31H_CFACTOR_ICORE 1000000 /* 1A / LSB */ > -#define F17H_M31H_CFACTOR_ISOC 310000 /* 0.31A / LSB */ > - > -/* F19h thermal registers through SMN */ > -#define F19H_M01_SVI_TEL_PLANE0 (ZEN_SVI_BASE + 0x14) > -#define F19H_M01_SVI_TEL_PLANE1 (ZEN_SVI_BASE + 0x10) > - > -#define F19H_M01H_CFACTOR_ICORE 1000000 /* 1A / LSB */ > -#define F19H_M01H_CFACTOR_ISOC 310000 /* 0.31A / LSB */ > - > struct k10temp_data { > struct pci_dev *pdev; > void (*read_htcreg)(struct pci_dev *pdev, u32 *regval);
diff --git a/drivers/hwmon/k10temp.c b/drivers/hwmon/k10temp.c index 3618a924e78e..662bad7ed0a2 100644 --- a/drivers/hwmon/k10temp.c +++ b/drivers/hwmon/k10temp.c @@ -76,26 +76,6 @@ static DEFINE_MUTEX(nb_smu_ind_mutex); #define ZEN_CUR_TEMP_SHIFT 21 #define ZEN_CUR_TEMP_RANGE_SEL_MASK BIT(19) -#define ZEN_SVI_BASE 0x0005A000 - -/* F17h thermal registers through SMN */ -#define F17H_M01H_SVI_TEL_PLANE0 (ZEN_SVI_BASE + 0xc) -#define F17H_M01H_SVI_TEL_PLANE1 (ZEN_SVI_BASE + 0x10) -#define F17H_M31H_SVI_TEL_PLANE0 (ZEN_SVI_BASE + 0x14) -#define F17H_M31H_SVI_TEL_PLANE1 (ZEN_SVI_BASE + 0x10) - -#define F17H_M01H_CFACTOR_ICORE 1000000 /* 1A / LSB */ -#define F17H_M01H_CFACTOR_ISOC 250000 /* 0.25A / LSB */ -#define F17H_M31H_CFACTOR_ICORE 1000000 /* 1A / LSB */ -#define F17H_M31H_CFACTOR_ISOC 310000 /* 0.31A / LSB */ - -/* F19h thermal registers through SMN */ -#define F19H_M01_SVI_TEL_PLANE0 (ZEN_SVI_BASE + 0x14) -#define F19H_M01_SVI_TEL_PLANE1 (ZEN_SVI_BASE + 0x10) - -#define F19H_M01H_CFACTOR_ICORE 1000000 /* 1A / LSB */ -#define F19H_M01H_CFACTOR_ISOC 310000 /* 0.31A / LSB */ - struct k10temp_data { struct pci_dev *pdev; void (*read_htcreg)(struct pci_dev *pdev, u32 *regval);
Usage of these definitions were removed after the commit 0a4e668b5d52 ("hwmon: (k10temp) Remove support for displaying voltage and current on Zen CPUs"). So, cleanup them up. Signed-off-by: Babu Moger <babu.moger@amd.com> --- drivers/hwmon/k10temp.c | 20 -------------------- 1 file changed, 20 deletions(-)