x86/platform: 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.359448901@linutronix.de

diff --git a/arch/x86/platform/atom/punit_atom_debug.c b/arch/x86/platform/atom/punit_atom_debug.c
index ee6b0780bea1c34cba03c8353159d92de8270dbd..f8ed5f66cd206a024f4c4ceb4f0a1373739fbdd1 100644 (file)
--- a/arch/x86/platform/atom/punit_atom_debug.c
+++ b/arch/x86/platform/atom/punit_atom_debug.c
@@ -117,17 +117,16 @@ static void punit_dbgfs_unregister(void)
        debugfs_remove_recursive(punit_dbg_file);
 }
 
-#define ICPU(model, drv_data) \
-       { X86_VENDOR_INTEL, 6, model, X86_FEATURE_MWAIT,\
-         (kernel_ulong_t)&drv_data }
+#define X86_MATCH(model, data)                                          \
+       X86_MATCH_VENDOR_FAM_MODEL_FEATURE(INTEL, 6, INTEL_FAM6_##model, \
+                                          X86_FEATURE_MWAIT, data)
 
 static const struct x86_cpu_id intel_punit_cpu_ids[] = {
-       ICPU(INTEL_FAM6_ATOM_SILVERMONT, punit_device_byt),
-       ICPU(INTEL_FAM6_ATOM_SILVERMONT_MID,  punit_device_tng),
-       ICPU(INTEL_FAM6_ATOM_AIRMONT,     punit_device_cht),
+       X86_MATCH(ATOM_SILVERMONT,              &punit_device_byt),
+       X86_MATCH(ATOM_SILVERMONT_MID,          &punit_device_tng),
+       X86_MATCH(ATOM_AIRMONT,                 &punit_device_cht),
        {}
 };
-
 MODULE_DEVICE_TABLE(x86cpu, intel_punit_cpu_ids);
 
 static int __init punit_atom_debug_init(void)

diff --git a/arch/x86/platform/efi/quirks.c b/arch/x86/platform/efi/quirks.c
index 88d32c06cffafe3c1777d05fc20b7d2871a34ba9..c000e03ecfe3c913b7a311d674a641872ac9d5e3 100644 (file)
--- a/arch/x86/platform/efi/quirks.c
+++ b/arch/x86/platform/efi/quirks.c
@@ -659,12 +659,9 @@ static int qrk_capsule_setup_info(struct capsule_info *cap_info, void **pkbuff,
        return 1;
 }
 
-#define ICPU(family, model, quirk_handler) \
-       { X86_VENDOR_INTEL, family, model, X86_FEATURE_ANY, \
-         (unsigned long)&quirk_handler }
-
 static const struct x86_cpu_id efi_capsule_quirk_ids[] = {
-       ICPU(5, 9, qrk_capsule_setup_info),     /* Intel Quark X1000 */
+       X86_MATCH_VENDOR_FAM_MODEL(INTEL, 5, INTEL_FAM5_QUARK_X1000,
+                                  &qrk_capsule_setup_info),
        { }
 };
 

diff --git a/arch/x86/platform/intel-mid/device_libs/platform_bt.c b/arch/x86/platform/intel-mid/device_libs/platform_bt.c
index e3f4bfc08f785b5940eff8b232c9fae9cbe7873f..31dda18bb3700528bd0f57ac7cdb5c19671bdc90 100644 (file)
--- a/arch/x86/platform/intel-mid/device_libs/platform_bt.c
+++ b/arch/x86/platform/intel-mid/device_libs/platform_bt.c
@@ -60,11 +60,8 @@ static struct bt_sfi_data tng_bt_sfi_data __initdata = {
        .setup  = tng_bt_sfi_setup,
 };
 
-#define ICPU(model, ddata)     \
-       { X86_VENDOR_INTEL, 6, model, X86_FEATURE_ANY, (kernel_ulong_t)&ddata }
-
 static const struct x86_cpu_id bt_sfi_cpu_ids[] = {
-       ICPU(INTEL_FAM6_ATOM_SILVERMONT_MID, tng_bt_sfi_data),
+       X86_MATCH_INTEL_FAM6_MODEL(ATOM_SILVERMONT_MID, &tng_bt_sfi_data),
        {}
 };
 

diff --git a/arch/x86/platform/intel-quark/imr.c b/arch/x86/platform/intel-quark/imr.c
index e9d97d52475e15136b1215aba3f95446b7080408..0286fe1b14b5cb57ca09f83ceb8a74d4f3b9f716 100644 (file)
--- a/arch/x86/platform/intel-quark/imr.c
+++ b/arch/x86/platform/intel-quark/imr.c
@@ -569,7 +569,7 @@ static void __init imr_fixup_memmap(struct imr_device *idev)
 }
 
 static const struct x86_cpu_id imr_ids[] __initconst = {
-       { X86_VENDOR_INTEL, 5, 9 },     /* Intel Quark SoC X1000. */
+       X86_MATCH_VENDOR_FAM_MODEL(INTEL, 5, INTEL_FAM5_QUARK_X1000, NULL),
        {}
 };
 

diff --git a/arch/x86/platform/intel-quark/imr_selftest.c b/arch/x86/platform/intel-quark/imr_selftest.c
index 4307830e1b6f027e8dd53c07c463c17aca7d9871..570e3062faac267df713fa8d8b2a3ba74461c579 100644 (file)
--- a/arch/x86/platform/intel-quark/imr_selftest.c
+++ b/arch/x86/platform/intel-quark/imr_selftest.c
@@ -105,7 +105,7 @@ static void __init imr_self_test(void)
 }
 
 static const struct x86_cpu_id imr_ids[] __initconst = {
-       { X86_VENDOR_INTEL, 5, 9 },     /* Intel Quark SoC X1000. */
+       X86_MATCH_VENDOR_FAM_MODEL(INTEL, 5, INTEL_FAM5_QUARK_X1000, NULL),
        {}
 };