linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Andi Kleen <andi@firstfloor.org>
To: linux-kernel@vger.kernel.org
Cc: hpa@zytor.com, trenn@suse.de, kay.sievers@vrf.org,
	Andi Kleen <ak@linux.intel.com>,
	khali@linux-fr.org, guenter.roeck@ericsson.com
Subject: [PATCH 06/10] HWMON: Convert via-cputemp to x86 cpuid autoprobing
Date: Mon, 19 Dec 2011 14:47:42 -0800	[thread overview]
Message-ID: <1324334865-30459-7-git-send-email-andi@firstfloor.org> (raw)
In-Reply-To: <1324334865-30459-1-git-send-email-andi@firstfloor.org>

From: Andi Kleen <ak@linux.intel.com>

Use the new x86 cpuid autoprobe interface.

Cc: khali@linux-fr.org
Cc: guenter.roeck@ericsson.com
Signed-off-by: Andi Kleen <ak@linux.intel.com>
---
 drivers/hwmon/via-cputemp.c |   16 +++++++++++-----
 1 files 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)
-- 
1.7.7.4


  parent reply	other threads:[~2011-12-19 22:48 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-12-19 22:47 Updated cpuid-match patchkit v2 Andi Kleen
2011-12-19 22:47 ` [PATCH 02/10] Add driver auto probing for x86 features Andi Kleen
2011-12-19 22:47 ` [PATCH 02/10] Add driver auto probing for x86 features v2 Andi Kleen
2011-12-19 22:47 ` [PATCH 03/10] crypto: Add support for x86 cpuid auto loading for x86 crypto drivers Andi Kleen
2011-12-19 23:22   ` Dave Jones
2011-12-19 23:25     ` H. Peter Anvin
2011-12-19 23:32       ` Dave Jones
2011-12-20  4:08       ` Andi Kleen
2011-12-20  4:54         ` H. Peter Anvin
2011-12-20  5:30           ` Herbert Xu
2011-12-20  5:35             ` H. Peter Anvin
2011-12-20  5:38               ` Herbert Xu
2011-12-20  6:48                 ` H. Peter Anvin
2011-12-19 22:47 ` [PATCH 04/10] intel-idle: convert to x86_cpu_id auto probing Andi Kleen
2011-12-19 22:47 ` [PATCH 05/10] ACPI: Load acpi-cpufreq from processor driver automatically Andi Kleen
2011-12-19 22:47 ` Andi Kleen [this message]
2011-12-19 22:47 ` [PATCH 07/10] HWMON: Convert coretemp to x86 cpuid autoprobing Andi Kleen
2011-12-19 22:47 ` [PATCH 08/10] cpufreq: Add support for x86 cpuinfo auto loading Andi Kleen
2011-12-19 23:03   ` Dave Jones
2011-12-19 23:12     ` Andi Kleen
2011-12-19 23:16       ` H. Peter Anvin
2011-12-19 22:47 ` [PATCH 09/10] x86: autoload microcode driver on Intel and AMD systems Andi Kleen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1324334865-30459-7-git-send-email-andi@firstfloor.org \
    --to=andi@firstfloor.org \
    --cc=ak@linux.intel.com \
    --cc=guenter.roeck@ericsson.com \
    --cc=hpa@zytor.com \
    --cc=kay.sievers@vrf.org \
    --cc=khali@linux-fr.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=trenn@suse.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).