cpufreq: Convert to new X86 CPU match macros

[sfrench/cifs-2.6.git] / drivers / cpufreq / intel_pstate.c

diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
index c81e1ff2906973f9729225d1cd0319638a72b4c8..780c387f05c0465e33e7a37db741bf102d0bae6b 100644 (file)
--- a/drivers/cpufreq/intel_pstate.c
+++ b/drivers/cpufreq/intel_pstate.c
@@ -1908,51 +1908,51 @@ static const struct pstate_funcs knl_funcs = {
        .get_val = core_get_val,
 };
 
-#define ICPU(model, policy) \
-       { X86_VENDOR_INTEL, 6, model, X86_FEATURE_APERFMPERF,\
-                       (unsigned long)&policy }
+#define X86_MATCH(model, policy)                                        \
+       X86_MATCH_VENDOR_FAM_MODEL_FEATURE(INTEL, 6, INTEL_FAM6_##model, \
+                                          X86_FEATURE_APERFMPERF, &policy)
 
 static const struct x86_cpu_id intel_pstate_cpu_ids[] = {
-       ICPU(INTEL_FAM6_SANDYBRIDGE,            core_funcs),
-       ICPU(INTEL_FAM6_SANDYBRIDGE_X,          core_funcs),
-       ICPU(INTEL_FAM6_ATOM_SILVERMONT,        silvermont_funcs),
-       ICPU(INTEL_FAM6_IVYBRIDGE,              core_funcs),
-       ICPU(INTEL_FAM6_HASWELL,                core_funcs),
-       ICPU(INTEL_FAM6_BROADWELL,              core_funcs),
-       ICPU(INTEL_FAM6_IVYBRIDGE_X,            core_funcs),
-       ICPU(INTEL_FAM6_HASWELL_X,              core_funcs),
-       ICPU(INTEL_FAM6_HASWELL_L,              core_funcs),
-       ICPU(INTEL_FAM6_HASWELL_G,              core_funcs),
-       ICPU(INTEL_FAM6_BROADWELL_G,            core_funcs),
-       ICPU(INTEL_FAM6_ATOM_AIRMONT,           airmont_funcs),
-       ICPU(INTEL_FAM6_SKYLAKE_L,              core_funcs),
-       ICPU(INTEL_FAM6_BROADWELL_X,            core_funcs),
-       ICPU(INTEL_FAM6_SKYLAKE,                core_funcs),
-       ICPU(INTEL_FAM6_BROADWELL_D,            core_funcs),
-       ICPU(INTEL_FAM6_XEON_PHI_KNL,           knl_funcs),
-       ICPU(INTEL_FAM6_XEON_PHI_KNM,           knl_funcs),
-       ICPU(INTEL_FAM6_ATOM_GOLDMONT,          core_funcs),
-       ICPU(INTEL_FAM6_ATOM_GOLDMONT_PLUS,     core_funcs),
-       ICPU(INTEL_FAM6_SKYLAKE_X,              core_funcs),
+       X86_MATCH(SANDYBRIDGE,          core_funcs),
+       X86_MATCH(SANDYBRIDGE_X,        core_funcs),
+       X86_MATCH(ATOM_SILVERMONT,      silvermont_funcs),
+       X86_MATCH(IVYBRIDGE,            core_funcs),
+       X86_MATCH(HASWELL,              core_funcs),
+       X86_MATCH(BROADWELL,            core_funcs),
+       X86_MATCH(IVYBRIDGE_X,          core_funcs),
+       X86_MATCH(HASWELL_X,            core_funcs),
+       X86_MATCH(HASWELL_L,            core_funcs),
+       X86_MATCH(HASWELL_G,            core_funcs),
+       X86_MATCH(BROADWELL_G,          core_funcs),
+       X86_MATCH(ATOM_AIRMONT,         airmont_funcs),
+       X86_MATCH(SKYLAKE_L,            core_funcs),
+       X86_MATCH(BROADWELL_X,          core_funcs),
+       X86_MATCH(SKYLAKE,              core_funcs),
+       X86_MATCH(BROADWELL_D,          core_funcs),
+       X86_MATCH(XEON_PHI_KNL,         knl_funcs),
+       X86_MATCH(XEON_PHI_KNM,         knl_funcs),
+       X86_MATCH(ATOM_GOLDMONT,        core_funcs),
+       X86_MATCH(ATOM_GOLDMONT_PLUS,   core_funcs),
+       X86_MATCH(SKYLAKE_X,            core_funcs),
        {}
 };
 MODULE_DEVICE_TABLE(x86cpu, intel_pstate_cpu_ids);
 
 static const struct x86_cpu_id intel_pstate_cpu_oob_ids[] __initconst = {
-       ICPU(INTEL_FAM6_BROADWELL_D, core_funcs),
-       ICPU(INTEL_FAM6_BROADWELL_X, core_funcs),
-       ICPU(INTEL_FAM6_SKYLAKE_X, core_funcs),
+       X86_MATCH(BROADWELL_D,          core_funcs),
+       X86_MATCH(BROADWELL_X,          core_funcs),
+       X86_MATCH(SKYLAKE_X,            core_funcs),
        {}
 };
 
 static const struct x86_cpu_id intel_pstate_cpu_ee_disable_ids[] = {
-       ICPU(INTEL_FAM6_KABYLAKE, core_funcs),
+       X86_MATCH(KABYLAKE,             core_funcs),
        {}
 };
 
 static const struct x86_cpu_id intel_pstate_hwp_boost_ids[] = {
-       ICPU(INTEL_FAM6_SKYLAKE_X, core_funcs),
-       ICPU(INTEL_FAM6_SKYLAKE, core_funcs),
+       X86_MATCH(SKYLAKE_X,            core_funcs),
+       X86_MATCH(SKYLAKE,              core_funcs),
        {}
 };
 
@@ -2725,13 +2725,14 @@ static inline void intel_pstate_request_control_from_smm(void) {}
 
 #define INTEL_PSTATE_HWP_BROADWELL     0x01
 
-#define ICPU_HWP(model, hwp_mode) \
-       { X86_VENDOR_INTEL, 6, model, X86_FEATURE_HWP, hwp_mode }
+#define X86_MATCH_HWP(model, hwp_mode)                                 \
+       X86_MATCH_VENDOR_FAM_MODEL_FEATURE(INTEL, 6, INTEL_FAM6_##model, \
+                                          X86_FEATURE_APERFMPERF, hwp_mode)
 
 static const struct x86_cpu_id hwp_support_ids[] __initconst = {
-       ICPU_HWP(INTEL_FAM6_BROADWELL_X, INTEL_PSTATE_HWP_BROADWELL),
-       ICPU_HWP(INTEL_FAM6_BROADWELL_D, INTEL_PSTATE_HWP_BROADWELL),
-       ICPU_HWP(X86_MODEL_ANY, 0),
+       X86_MATCH_HWP(BROADWELL_X,      INTEL_PSTATE_HWP_BROADWELL),
+       X86_MATCH_HWP(BROADWELL_D,      INTEL_PSTATE_HWP_BROADWELL),
+       X86_MATCH_HWP(ANY,              0),
        {}
 };