[PATCH v1 1/4] x86/cpu: Introduce INTEL_CPU_FAM*_NODATA() helper macros

From: Andy Shevchenko
Date: Fri Aug 31 2018 - 05:12:54 EST


These macros are often used by drivers and we have already a lot of
duplication as ICPU() macro across the drivers.

Provide a generic x86 macro for users.

This adds no driver data variants.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
---
arch/x86/include/asm/intel-family.h | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/arch/x86/include/asm/intel-family.h b/arch/x86/include/asm/intel-family.h
index 7ed08a7c3398..093014aceb65 100644
--- a/arch/x86/include/asm/intel-family.h
+++ b/arch/x86/include/asm/intel-family.h
@@ -83,10 +83,16 @@
.family = _family, \
.model = _model, \
.feature = X86_FEATURE_ANY, \
- .driver_data = (kernel_ulong_t)&_driver_data \
+ .driver_data = (kernel_ulong_t)_driver_data \
}

#define INTEL_CPU_FAM6(_model, _driver_data) \
- INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
+ INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, &_driver_data)
+
+#define INTEL_CPU_FAM_ANY_NODATA(_family, _model) \
+ INTEL_CPU_FAM_ANY(_family, _model, NULL)
+
+#define INTEL_CPU_FAM6_NODATA(_model) \
+ INTEL_CPU_FAM_ANY_NODATA(6, INTEL_FAM6_##_model)

#endif /* _ASM_X86_INTEL_FAMILY_H */
--
2.18.0