ACPI: 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.

Rename the local macro wrapper to X86_MATCH for consistency. It stays for
readability sake.

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

diff --git a/drivers/acpi/acpi_lpss.c b/drivers/acpi/acpi_lpss.c
index db18df6..dee9999 100644 (file)
--- a/drivers/acpi/acpi_lpss.c
+++ b/drivers/acpi/acpi_lpss.c
@@ -306,11 +306,9 @@ static const struct lpss_device_desc bsw_spi_dev_desc = {
        .setup = lpss_deassert_reset,
 };
 
-#define ICPU(model)    { X86_VENDOR_INTEL, 6, model, X86_FEATURE_ANY, }
-
 static const struct x86_cpu_id lpss_cpu_ids[] = {
-       ICPU(INTEL_FAM6_ATOM_SILVERMONT),       /* Valleyview, Bay Trail */
-       ICPU(INTEL_FAM6_ATOM_AIRMONT),  /* Braswell, Cherry Trail */
+       X86_MATCH_INTEL_FAM6_MODEL(ATOM_SILVERMONT,     NULL),
+       X86_MATCH_INTEL_FAM6_MODEL(ATOM_AIRMONT,        NULL),
        {}
 };
 

diff --git a/drivers/acpi/x86/utils.c b/drivers/acpi/x86/utils.c
index 697a6b1..bdc1ba0 100644 (file)
--- a/drivers/acpi/x86/utils.c
+++ b/drivers/acpi/x86/utils.c
@@ -37,7 +37,7 @@ struct always_present_id {
        const char *uid;
 };
 
-#define ICPU(model)    { X86_VENDOR_INTEL, 6, model, X86_FEATURE_ANY, }
+#define X86_MATCH(model)       X86_MATCH_INTEL_FAM6_MODEL(model, NULL)
 
 #define ENTRY(hid, uid, cpu_models, dmi...) {                          \
        { { hid, }, {} },                                               \
@@ -51,29 +51,29 @@ static const struct always_present_id always_present_ids[] = {
         * Bay / Cherry Trail PWM directly poked by GPU driver in win10,
         * but Linux uses a separate PWM driver, harmless if not used.
         */
-       ENTRY("80860F09", "1", ICPU(INTEL_FAM6_ATOM_SILVERMONT), {}),
-       ENTRY("80862288", "1", ICPU(INTEL_FAM6_ATOM_AIRMONT), {}),
+       ENTRY("80860F09", "1", X86_MATCH(ATOM_SILVERMONT), {}),
+       ENTRY("80862288", "1", X86_MATCH(ATOM_AIRMONT), {}),
 
        /* Lenovo Yoga Book uses PWM2 for keyboard backlight control */
-       ENTRY("80862289", "2", ICPU(INTEL_FAM6_ATOM_AIRMONT), {
+       ENTRY("80862289", "2", X86_MATCH(ATOM_AIRMONT), {
                        DMI_MATCH(DMI_PRODUCT_NAME, "Lenovo YB1-X9"),
                }),
        /*
         * The INT0002 device is necessary to clear wakeup interrupt sources
         * on Cherry Trail devices, without it we get nobody cared IRQ msgs.
         */
-       ENTRY("INT0002", "1", ICPU(INTEL_FAM6_ATOM_AIRMONT), {}),
+       ENTRY("INT0002", "1", X86_MATCH(ATOM_AIRMONT), {}),
        /*
         * On the Dell Venue 11 Pro 7130 and 7139, the DSDT hides
         * the touchscreen ACPI device until a certain time
         * after _SB.PCI0.GFX0.LCD.LCD1._ON gets called has passed
         * *and* _STA has been called at least 3 times since.
         */
-       ENTRY("SYNA7500", "1", ICPU(INTEL_FAM6_HASWELL_L), {
+       ENTRY("SYNA7500", "1", X86_MATCH(HASWELL_L), {
                DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
                DMI_MATCH(DMI_PRODUCT_NAME, "Venue 11 Pro 7130"),
              }),
-       ENTRY("SYNA7500", "1", ICPU(INTEL_FAM6_HASWELL_L), {
+       ENTRY("SYNA7500", "1", X86_MATCH(HASWELL_L), {
                DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
                DMI_MATCH(DMI_PRODUCT_NAME, "Venue 11 Pro 7139"),
              }),
@@ -89,19 +89,19 @@ static const struct always_present_id always_present_ids[] = {
         * was copy-pasted from the GPD win, so it has a disabled KIOX000A
         * node which we should not enable, thus we also check the BIOS date.
         */
-       ENTRY("KIOX000A", "1", ICPU(INTEL_FAM6_ATOM_AIRMONT), {
+       ENTRY("KIOX000A", "1", X86_MATCH(ATOM_AIRMONT), {
                DMI_MATCH(DMI_BOARD_VENDOR, "AMI Corporation"),
                DMI_MATCH(DMI_BOARD_NAME, "Default string"),
                DMI_MATCH(DMI_PRODUCT_NAME, "Default string"),
                DMI_MATCH(DMI_BIOS_DATE, "02/21/2017")
              }),
-       ENTRY("KIOX000A", "1", ICPU(INTEL_FAM6_ATOM_AIRMONT), {
+       ENTRY("KIOX000A", "1", X86_MATCH(ATOM_AIRMONT), {
                DMI_MATCH(DMI_BOARD_VENDOR, "AMI Corporation"),
                DMI_MATCH(DMI_BOARD_NAME, "Default string"),
                DMI_MATCH(DMI_PRODUCT_NAME, "Default string"),
                DMI_MATCH(DMI_BIOS_DATE, "03/20/2017")
              }),
-       ENTRY("KIOX000A", "1", ICPU(INTEL_FAM6_ATOM_AIRMONT), {
+       ENTRY("KIOX000A", "1", X86_MATCH(ATOM_AIRMONT), {
                DMI_MATCH(DMI_BOARD_VENDOR, "AMI Corporation"),
                DMI_MATCH(DMI_BOARD_NAME, "Default string"),
                DMI_MATCH(DMI_PRODUCT_NAME, "Default string"),