lkml.org 
[lkml]   [2011]   [Dec]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 06/10] HWMON: Convert via-cputemp to x86 cpuid autoprobing
    Date
    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


    \
     
     \ /
      Last update: 2011-12-19 23:51    [W:0.022 / U:0.152 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site