EDAC, pnd2: Switch to new Intel CPU model defines

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

Signed-off-by: Tony Luck <tony.luck@intel.com>
Link: https://lore.kernel.org/r/20240520224620.9480-37-tony.luck@intel.com

diff --git a/drivers/edac/pnd2_edac.c b/drivers/edac/pnd2_edac.c
index 2afcd148fcf88060d11760b709d9f9793773261f..f93f2f2b1cf25c6d5c7593d0030b81733db9e6ab 100644 (file)
--- a/drivers/edac/pnd2_edac.c
+++ b/drivers/edac/pnd2_edac.c
@@ -1511,8 +1511,8 @@ static struct dunit_ops dnv_ops = {
 };
 
 static const struct x86_cpu_id pnd2_cpuids[] = {
-       X86_MATCH_INTEL_FAM6_MODEL(ATOM_GOLDMONT,       &apl_ops),
-       X86_MATCH_INTEL_FAM6_MODEL(ATOM_GOLDMONT_D,     &dnv_ops),
+       X86_MATCH_VFM(INTEL_ATOM_GOLDMONT,      &apl_ops),
+       X86_MATCH_VFM(INTEL_ATOM_GOLDMONT_D,    &dnv_ops),
        { }
 };
 MODULE_DEVICE_TABLE(x86cpu, pnd2_cpuids);