diff options
| author |   Thomas Gleixner <tglx@linutronix.de> | 2020-03-20 14:13:56 +0100 |
|---|---|---|
| committer |   Borislav Petkov <bp@suse.de> | 2020-03-24 21:33:00 +0100 |
| commit | a69b3b1d4cf061d9197d835dcf539d2dd7b9e46f (patch) | |
| tree | a124f4dad1f7360c2d5a82202828eadc90a0b5d5 /drivers/platform/x86/intel-uncore-frequency.c | |
| parent | EDAC: Convert to new X86 CPU match macros (diff) | |
| download | wireguard-linux-a69b3b1d4cf061d9197d835dcf539d2dd7b9e46f.tar.xz wireguard-linux-a69b3b1d4cf061d9197d835dcf539d2dd7b9e46f.zip | |
platform/x86: Convert to new 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 macro wrappers for consistency.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Borislav Petkov <bp@suse.de>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Link: https://lkml.kernel.org/r/20200320131509.766573641@linutronix.de
Diffstat (limited to 'drivers/platform/x86/intel-uncore-frequency.c')
| -rw-r--r-- | drivers/platform/x86/intel-uncore-frequency.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/drivers/platform/x86/intel-uncore-frequency.c b/drivers/platform/x86/intel-uncore-frequency.c index 2b1a0734c3f8..859272075a8f 100644 --- a/drivers/platform/x86/intel-uncore-frequency.c +++ b/drivers/platform/x86/intel-uncore-frequency.c @@ -358,15 +358,13 @@ static struct notifier_block uncore_pm_nb = { .notifier_call = uncore_pm_notify, }; -#define ICPU(model) { X86_VENDOR_INTEL, 6, model, X86_FEATURE_ANY, } - static const struct x86_cpu_id intel_uncore_cpu_ids[] = { - ICPU(INTEL_FAM6_BROADWELL_G), - ICPU(INTEL_FAM6_BROADWELL_X), - ICPU(INTEL_FAM6_BROADWELL_D), - ICPU(INTEL_FAM6_SKYLAKE_X), - ICPU(INTEL_FAM6_ICELAKE_X), - ICPU(INTEL_FAM6_ICELAKE_D), + X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_G, NULL), + X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_X, NULL), + X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_D, NULL), + X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE_X, NULL), + X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_X, NULL), + X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_D, NULL), {} }; |