diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2020-03-20 14:13:58 +0100 |
---|---|---|
committer | Borislav Petkov <bp@suse.de> | 2020-03-24 21:33:53 +0100 |
commit | 9c51044cbc5fe9bb2c3bf71cb0dbcbd96ed03301 (patch) | |
tree | 657fe942789b829a4ed1a09d773cacc8e51d0849 /drivers/thermal/intel/intel_soc_dts_thermal.c | |
parent | 5cfc7ac7c1bf6014e9d22c41a724258d6c37a471 (diff) | |
download | linux-stable-9c51044cbc5fe9bb2c3bf71cb0dbcbd96ed03301.tar.gz linux-stable-9c51044cbc5fe9bb2c3bf71cb0dbcbd96ed03301.tar.bz2 linux-stable-9c51044cbc5fe9bb2c3bf71cb0dbcbd96ed03301.zip |
thermal: Convert to new X86 CPU match macros
The new macro set has a consistent namespace and uses C99 initializers
instead of the grufty C89 ones.
Get rid the of the local QUARK defines and use the proper ones.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Borislav Petkov <bp@suse.de>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Link: https://lkml.kernel.org/r/20200320131509.967017771@linutronix.de
Diffstat (limited to 'drivers/thermal/intel/intel_soc_dts_thermal.c')
-rw-r--r-- | drivers/thermal/intel/intel_soc_dts_thermal.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/thermal/intel/intel_soc_dts_thermal.c b/drivers/thermal/intel/intel_soc_dts_thermal.c index f4be9c14e5d9..92e5c19d03f6 100644 --- a/drivers/thermal/intel/intel_soc_dts_thermal.c +++ b/drivers/thermal/intel/intel_soc_dts_thermal.c @@ -36,8 +36,7 @@ static irqreturn_t soc_irq_thread_fn(int irq, void *dev_data) } static const struct x86_cpu_id soc_thermal_ids[] = { - { X86_VENDOR_INTEL, 6, INTEL_FAM6_ATOM_SILVERMONT, 0, - BYT_SOC_DTS_APIC_IRQ}, + X86_MATCH_INTEL_FAM6_MODEL(ATOM_SILVERMONT, BYT_SOC_DTS_APIC_IRQ), {} }; MODULE_DEVICE_TABLE(x86cpu, soc_thermal_ids); |