Commit 628b4504 authored by Andreas Herrmann's avatar Andreas Herrmann Committed by Jean Delvare
Browse files

hwmon: (k8temp) Remove superfluous CPU family check 



The family check in k8temp is not required because the driver is
already bound to a northbridge device only used with K8 CPUs.

Signed-off-by: default avatarAndreas Herrmann <andreas.herrmann3@amd.com>
Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
parent 81280572

drivers/hwmon/k8temp.c

+22 −29
Original line number Diff line number Diff line
@@ -191,8 +191,6 @@ static int __devinit k8temp_probe(struct pci_dev *pdev, 
	model = boot_cpu_data.x86_model;

	stepping = boot_cpu_data.x86_mask;



	switch (boot_cpu_data.x86) {

	case 0xf:

	/* feature available since SH-C0, exclude older revisions */

	if (((model == 4) && (stepping == 0)) ||

	    ((model == 5) && (stepping <= 1))) {
@@ -206,22 +204,17 @@ static int __devinit k8temp_probe(struct pci_dev *pdev, 
	 */

	if (model >= 0x40) {

		data->swap_core_select = 1;

			dev_warn(&pdev->dev, "Temperature readouts might be "

				 "wrong - check erratum #141\n");

		dev_warn(&pdev->dev, "Temperature readouts might be wrong - "

			 "check erratum #141\n");

	}



		if (is_rev_g_desktop(model)) {

	/*

			 * RevG desktop CPUs (i.e. no socket S1G1 or

			 * ASB1 parts) need additional offset,

			 * otherwise reported temperature is below

	 * RevG desktop CPUs (i.e. no socket S1G1 or ASB1 parts) need

	 * additional offset, otherwise reported temperature is below

	 * ambient temperature

	 */

	if (is_rev_g_desktop(model))

		data->temp_offset = 21000;

		}



		break;

	}



	pci_read_config_byte(pdev, REG_TEMP, &scfg);

	scfg &= ~(SEL_PLACE | SEL_CORE);		/* Select sensor 0, core0 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE