Commit 9c51044c authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Borislav Petkov
Browse files

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: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Reviewed-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Link: https://lkml.kernel.org/r/20200320131509.967017771@linutronix.de
parent 5cfc7ac7

drivers/thermal/intel/intel_powerclamp.c

+1 −1
Original line number Diff line number Diff line
@@ -651,7 +651,7 @@ static struct thermal_cooling_device_ops powerclamp_cooling_ops = { 
};



static const struct x86_cpu_id __initconst intel_powerclamp_ids[] = {

	{ X86_VENDOR_INTEL, X86_FAMILY_ANY, X86_MODEL_ANY, X86_FEATURE_MWAIT },

	X86_MATCH_VENDOR_FEATURE(INTEL, X86_FEATURE_MWAIT, NULL),

	{}

};

MODULE_DEVICE_TABLE(x86cpu, intel_powerclamp_ids);

drivers/thermal/intel/intel_quark_dts_thermal.c

+1 −4
Original line number Diff line number Diff line
@@ -64,9 +64,6 @@ 
#include <asm/cpu_device_id.h>

#include <asm/iosf_mbi.h>



#define X86_FAMILY_QUARK	0x5

#define X86_MODEL_QUARK_X1000	0x9



/* DTS reset is programmed via QRK_MBI_UNIT_SOC */

#define QRK_DTS_REG_OFFSET_RESET	0x34

#define QRK_DTS_RESET_BIT		BIT(0)
@@ -433,7 +430,7 @@ err_ret: 
}



static const struct x86_cpu_id qrk_thermal_ids[] __initconst  = {

	{ X86_VENDOR_INTEL, X86_FAMILY_QUARK, X86_MODEL_QUARK_X1000 },

	X86_MATCH_VENDOR_FAM_MODEL(INTEL, 5, INTEL_FAM5_QUARK_X1000, NULL),

	{}

};

MODULE_DEVICE_TABLE(x86cpu, qrk_thermal_ids);

drivers/thermal/intel/intel_soc_dts_thermal.c

+1 −2
Original line number Diff line number Diff line
@@ -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);

drivers/thermal/intel/x86_pkg_temp_thermal.c

+1 −1
Original line number Diff line number Diff line
@@ -478,7 +478,7 @@ static int pkg_thermal_cpu_online(unsigned int cpu) 
}



static const struct x86_cpu_id __initconst pkg_temp_thermal_ids[] = {

	{ X86_VENDOR_INTEL, X86_FAMILY_ANY, X86_MODEL_ANY, X86_FEATURE_PTS },

	X86_MATCH_VENDOR_FEATURE(INTEL, X86_FEATURE_PTS, NULL),

	{}

};

MODULE_DEVICE_TABLE(x86cpu, pkg_temp_thermal_ids);

CRA Git | Maintained and supported by SUSTech CRA and CCSE