Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 267fc978 authored by Andi Kleen's avatar Andi Kleen Committed by Greg Kroah-Hartman
Browse files

HWMON: Convert via-cputemp to x86 cpuid autoprobing 



Use the new x86 cpuid autoprobe interface.

Cc: Jean Delvare <khali@linux-fr.org>
Cc: Guenter Roeck <guenter.roeck@ericsson.com>
Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
Signed-off-by: default avatarThomas Renninger <trenn@suse.de>
Acked-by: default avatarH. Peter Anvin <hpa@zytor.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 9061e0e1

drivers/hwmon/via-cputemp.c

+11 −5
Original line number Original line Diff line number Diff line
@@ -37,6 +37,7 @@ 
#include <linux/cpu.h>

#include <linux/cpu.h>

#include <asm/msr.h>

#include <asm/msr.h>

#include <asm/processor.h>

#include <asm/processor.h>

#include <asm/cpu_device_id.h>





#define DRVNAME	"via_cputemp"

#define DRVNAME	"via_cputemp"
@@ -308,15 +309,20 @@ static struct notifier_block via_cputemp_cpu_notifier __refdata = { 
	.notifier_call = via_cputemp_cpu_callback,

	.notifier_call = via_cputemp_cpu_callback,

};

};





static const struct x86_cpu_id cputemp_ids[] = {

	{ X86_VENDOR_CENTAUR, 6, 0xa, }, /* C7 A */

	{ X86_VENDOR_CENTAUR, 6, 0xd, }, /* C7 D */

	{ X86_VENDOR_CENTAUR, 6, 0xf, }, /* Nano */

	{}

};

MODULE_DEVICE_TABLE(x86cpu, cputemp_ids);



static int __init via_cputemp_init(void)

static int __init via_cputemp_init(void)

{

{

	int i, err;

	int i, err;





	if (cpu_data(0).x86_vendor != X86_VENDOR_CENTAUR) {

	if (!x86_match_cpu(cputemp_ids))

		printk(KERN_DEBUG DRVNAME ": Not a VIA CPU\n");

		return -ENODEV;

		err = -ENODEV;

		goto exit;

	}





	err = platform_driver_register(&via_cputemp_driver);

	err = platform_driver_register(&via_cputemp_driver);

	if (err)

	if (err)