ACPI: mipi-disco-img: Switch to new Intel CPU model defines

Switch over to using the new Intel CPU model defines, as the old ones
are going away.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/acpi/mipi-disco-img.c b/drivers/acpi/mipi-disco-img.c
index 0ab13751f0dbc1e65c5f018c690e61de137255a2..92b658f92dc0f1d9123cdcb1d49a130a41f600be 100644 (file)
--- a/drivers/acpi/mipi-disco-img.c
+++ b/drivers/acpi/mipi-disco-img.c
@@ -731,13 +731,13 @@ void acpi_mipi_crs_csi2_cleanup(void)
 
 /* CPU matches for Dell generations with broken ACPI MIPI DISCO info */
 static const struct x86_cpu_id dell_broken_mipi_disco_cpu_gens[] = {
-       X86_MATCH_INTEL_FAM6_MODEL(TIGERLAKE, NULL),
-       X86_MATCH_INTEL_FAM6_MODEL(TIGERLAKE_L, NULL),
-       X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE, NULL),
-       X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE_L, NULL),
-       X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE, NULL),
-       X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_P, NULL),
-       X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_S, NULL),
+       X86_MATCH_VFM(INTEL_TIGERLAKE, NULL),
+       X86_MATCH_VFM(INTEL_TIGERLAKE_L, NULL),
+       X86_MATCH_VFM(INTEL_ALDERLAKE, NULL),
+       X86_MATCH_VFM(INTEL_ALDERLAKE_L, NULL),
+       X86_MATCH_VFM(INTEL_RAPTORLAKE, NULL),
+       X86_MATCH_VFM(INTEL_RAPTORLAKE_P, NULL),
+       X86_MATCH_VFM(INTEL_RAPTORLAKE_S, NULL),
        {}
 };