hwmon: Convert to new X86 CPU match macros

The new macro set has a consistent namespace and uses C99 initializers
instead of the grufty C89 ones.

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.859324598@linutronix.de

diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c
index d855c78fb8bea77d87df0fe2a16289a039bc63ed..bb9211215a688f8eb06ae11b94a58ae68e368cc9 100644 (file)
--- a/drivers/hwmon/coretemp.c
+++ b/drivers/hwmon/coretemp.c
@@ -709,7 +709,7 @@ static int coretemp_cpu_offline(unsigned int cpu)
        return 0;
 }
 static const struct x86_cpu_id __initconst coretemp_ids[] = {
-       { X86_VENDOR_INTEL, X86_FAMILY_ANY, X86_MODEL_ANY, X86_FEATURE_DTHERM },
+       X86_MATCH_VENDOR_FEATURE(INTEL, X86_FEATURE_DTHERM, NULL),
        {}
 };
 MODULE_DEVICE_TABLE(x86cpu, coretemp_ids);

diff --git a/drivers/hwmon/via-cputemp.c b/drivers/hwmon/via-cputemp.c
index 8264e849e588cc3ba19cb22745c4a03abc8d7647..e5d18dac8ee7ba91682cc9c421baa6632169443b 100644 (file)
--- a/drivers/hwmon/via-cputemp.c
+++ b/drivers/hwmon/via-cputemp.c
@@ -270,10 +270,10 @@ static int via_cputemp_down_prep(unsigned int cpu)
 }
 
 static const struct x86_cpu_id __initconst cputemp_ids[] = {
-       { X86_VENDOR_CENTAUR, 6, 0xa, }, /* C7 A */
-       { X86_VENDOR_CENTAUR, 6, 0xd, }, /* C7 D */
-       { X86_VENDOR_CENTAUR, 6, 0xf, }, /* Nano */
-       { X86_VENDOR_CENTAUR, 7, X86_MODEL_ANY, },
+       X86_MATCH_VENDOR_FAM_MODEL(CENTAUR, 6, X86_CENTAUR_FAM6_C7_A,   NULL),
+       X86_MATCH_VENDOR_FAM_MODEL(CENTAUR, 6, X86_CENTAUR_FAM6_C7_D,   NULL),
+       X86_MATCH_VENDOR_FAM_MODEL(CENTAUR, 6, X86_CENTAUR_FAM6_NANO,   NULL),
+       X86_MATCH_VENDOR_FAM_MODEL(CENTAUR, 7, X86_MODEL_ANY,           NULL),
        {}
 };
 MODULE_DEVICE_TABLE(x86cpu, cputemp_ids);