diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2020-03-20 14:13:51 +0100 |
|---|---|---|
| committer | Borislav Petkov <bp@suse.de> | 2020-03-24 21:28:26 +0100 |
| commit | adefe55e725821e8ae23207992ded5994f1650a9 (patch) | |
| tree | 31ba07c4fe455945c66cc937dc6fa9fc80f3b0c1 /arch/x86/power/cpu.c | |
| parent | 320debe5ef6d4990a70535b5cf891472e6e14d93 (diff) | |
| download | linux-stable-adefe55e725821e8ae23207992ded5994f1650a9.tar.gz linux-stable-adefe55e725821e8ae23207992ded5994f1650a9.tar.bz2 linux-stable-adefe55e725821e8ae23207992ded5994f1650a9.zip | |
x86/kernel: 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Link: https://lkml.kernel.org/r/20200320131509.250559388@linutronix.de
Diffstat (limited to 'arch/x86/power/cpu.c')
| -rw-r--r-- | arch/x86/power/cpu.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/arch/x86/power/cpu.c b/arch/x86/power/cpu.c index 915bb1639763..aaff9ed7ff45 100644 --- a/arch/x86/power/cpu.c +++ b/arch/x86/power/cpu.c @@ -475,20 +475,8 @@ static int msr_save_cpuid_features(const struct x86_cpu_id *c) } static const struct x86_cpu_id msr_save_cpu_table[] = { - { - .vendor = X86_VENDOR_AMD, - .family = 0x15, - .model = X86_MODEL_ANY, - .feature = X86_FEATURE_ANY, - .driver_data = (kernel_ulong_t)msr_save_cpuid_features, - }, - { - .vendor = X86_VENDOR_AMD, - .family = 0x16, - .model = X86_MODEL_ANY, - .feature = X86_FEATURE_ANY, - .driver_data = (kernel_ulong_t)msr_save_cpuid_features, - }, + X86_MATCH_VENDOR_FAM(AMD, 0x15, &msr_save_cpuid_features), + X86_MATCH_VENDOR_FAM(AMD, 0x16, &msr_save_cpuid_features), {} }; |