PCI/PM: Switch to new Intel CPU model defines

New CPU #defines encode vendor and family as well as model.

Link: https://lore.kernel.org/r/20240611172816.352828-1-tony.luck@intel.com
Signed-off-by: Tony Luck <tony.luck@intel.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

diff --git a/drivers/pci/pci-mid.c b/drivers/pci/pci-mid.c
index fbfd7812712381c9f5dfb6b3b7dc47751dbfa228..bed9f0755271d1b7e31d7c3e8d1819fbc6844d30 100644 (file)
--- a/drivers/pci/pci-mid.c
+++ b/drivers/pci/pci-mid.c
@@ -38,8 +38,8 @@ pci_power_t mid_pci_get_power_state(struct pci_dev *pdev)
  * arch/x86/platform/intel-mid/pwr.c.
  */
 static const struct x86_cpu_id lpss_cpu_ids[] = {
-       X86_MATCH_INTEL_FAM6_MODEL(ATOM_SALTWELL_MID, NULL),
-       X86_MATCH_INTEL_FAM6_MODEL(ATOM_SILVERMONT_MID, NULL),
+       X86_MATCH_VFM(INTEL_ATOM_SALTWELL_MID, NULL),
+       X86_MATCH_VFM(INTEL_ATOM_SILVERMONT_MID, NULL),
        {}
 };