diff options
| author |  Thomas Gleixner <tglx@linutronix.de>
| 2020-03-20 14:14:07 +0100 |
|---|---|---|
| committer |  Borislav Petkov <bp@suse.de>
| 2020-03-24 21:37:23 +0100 |
| commit | 1826d56bcef9c38287f7c1a8e3b7778863e0b9d7 (patch) | |
| tree | 802bface6979d1b89e1570c3439f41b90dc162f6 | |
| parent | hwrng: via_rng: Convert to new X86 CPU match macros (diff) | |
| download | linux-1826d56bcef9c38287f7c1a8e3b7778863e0b9d7.tar.gz linux-1826d56bcef9c38287f7c1a8e3b7778863e0b9d7.tar.bz2 linux-1826d56bcef9c38287f7c1a8e3b7778863e0b9d7.zip | |
x86/cpu: Cleanup the now unused CPU match macros
No more users.
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/20200320131510.900226233@linutronix.de
| -rw-r--r-- | arch/x86/include/asm/cpu_device_id.h | 3 | ||||
| -rw-r--r-- | arch/x86/include/asm/intel-family.h | 13 |
2 files changed, 0 insertions, 16 deletions
diff --git a/arch/x86/include/asm/cpu_device_id.h b/arch/x86/include/asm/cpu_device_id.h index f11770fac73a..cf3d621c6892 100644 --- a/arch/x86/include/asm/cpu_device_id.h +++ b/arch/x86/include/asm/cpu_device_id.h @@ -91,9 +91,6 @@ #define X86_MATCH_FEATURE(feature, data) \ X86_MATCH_VENDOR_FEATURE(ANY, feature, data) -/* Transitional to keep the existing code working */ -#define X86_FEATURE_MATCH(feature) X86_MATCH_FEATURE(feature, NULL) - /** * X86_MATCH_VENDOR_FAM_MODEL - Match vendor, family and model * @vendor: The vendor name, e.g. INTEL, AMD, HYGON, ..., ANY diff --git a/arch/x86/include/asm/intel-family.h b/arch/x86/include/asm/intel-family.h index 236a87aa84d6..8f1e94f29a16 100644 --- a/arch/x86/include/asm/intel-family.h +++ b/arch/x86/include/asm/intel-family.h @@ -124,17 +124,4 @@ /* Family 5 */ #define INTEL_FAM5_QUARK_X1000 0x09 /* Quark X1000 SoC */ -/* Useful macros */ -#define INTEL_CPU_FAM_ANY(_family, _model, _driver_data) \ -{ \ - .vendor = X86_VENDOR_INTEL, \ - .family = _family, \ - .model = _model, \ - .feature = X86_FEATURE_ANY, \ - .driver_data = (kernel_ulong_t)&_driver_data \ -} - -#define INTEL_CPU_FAM6(_model, _driver_data) \ - INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data) - #endif /* _ASM_X86_INTEL_FAMILY_H */ |