57 lines
1.6 KiB
Diff
57 lines
1.6 KiB
Diff
From: Andi Kleen <ak@linux.intel.com>
|
|
Date: Thu, 26 Jan 2012 00:09:09 +0100
|
|
Subject: HWMON: Convert via-cputemp to x86 cpuid autoprobing
|
|
|
|
commit 267fc9788d0cdb77edafb506063f06961e1418f5 upstream.
|
|
|
|
Use the new x86 cpuid autoprobe interface.
|
|
|
|
Cc: Jean Delvare <khali@linux-fr.org>
|
|
Cc: Guenter Roeck <guenter.roeck@ericsson.com>
|
|
Signed-off-by: Andi Kleen <ak@linux.intel.com>
|
|
Signed-off-by: Thomas Renninger <trenn@suse.de>
|
|
Acked-by: H. Peter Anvin <hpa@zytor.com>
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
|
|
---
|
|
drivers/hwmon/via-cputemp.c | 16 +++++++++++-----
|
|
1 file changed, 11 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/drivers/hwmon/via-cputemp.c b/drivers/hwmon/via-cputemp.c
|
|
index 8eac67d..8689664 100644
|
|
--- a/drivers/hwmon/via-cputemp.c
|
|
+++ b/drivers/hwmon/via-cputemp.c
|
|
@@ -37,6 +37,7 @@
|
|
#include <linux/cpu.h>
|
|
#include <asm/msr.h>
|
|
#include <asm/processor.h>
|
|
+#include <asm/cpu_device_id.h>
|
|
|
|
#define DRVNAME "via_cputemp"
|
|
|
|
@@ -308,15 +309,20 @@ static struct notifier_block via_cputemp_cpu_notifier __refdata = {
|
|
.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)
|
|
{
|
|
int i, err;
|
|
|
|
- if (cpu_data(0).x86_vendor != X86_VENDOR_CENTAUR) {
|
|
- printk(KERN_DEBUG DRVNAME ": Not a VIA CPU\n");
|
|
- err = -ENODEV;
|
|
- goto exit;
|
|
- }
|
|
+ if (!x86_match_cpu(cputemp_ids))
|
|
+ return -ENODEV;
|
|
|
|
err = platform_driver_register(&via_cputemp_driver);
|
|
if (err)
|