Re: [PATCH 05/10] HWMON: Convert via-cputemp to x86 cpuid autoprobing

[Jean Delvare <khali@linux-fr.org>]

On Wed,  7 Dec 2011 16:41:18 -0800, Andi Kleen wrote:
> 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 |   29 +++++++++++------------------
>  1 files changed, 11 insertions(+), 18 deletions(-)
> 
> diff --git a/drivers/hwmon/via-cputemp.c b/drivers/hwmon/via-cputemp.c
> index 8eac67d..36ddb83 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,34 +309,26 @@ static struct notifier_block via_cputemp_cpu_notifier __refdata = {
>  	.notifier_call = via_cputemp_cpu_callback,
>  };
>  
> +static struct x86_cpu_id cputemp_ids[] = {

Shall be const.

> +	{ X86_VENDOR_CENTAUR, 6, 0xa, }, /* C7a */
> +	{ X86_VENDOR_CENTAUR, 6, 0xd, }, /* C7d */

Better spelt "C7 A" and "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)
>  		goto exit;
>  
>  	for_each_online_cpu(i) {
> -		struct cpuinfo_x86 *c = &cpu_data(i);
> -
> -		if (c->x86 != 6)
> -			continue;
> -
> -		if (c->x86_model < 0x0a)
> -			continue;
> -
> -		if (c->x86_model > 0x0f) {
> -			pr_warn("Unknown CPU model 0x%x\n", c->x86_model);
> -			continue;
> -		}

Here again, the per-cpu check was intended, and I would like to
preserve that (even though SMP systems based on VIA CPUs must be
rare...)

> -
>  		via_cputemp_device_add(i);
>  	}
>  


-- 
Jean Delvare