[tip: x86/cpu] extcon: axp288: Switch to new Intel CPU model defines

From: tip-bot2 for Tony Luck
Date: Thu Sep 05 2024 - 04:38:53 EST


The following commit has been merged into the x86/cpu branch of tip:

Commit-ID: 171a7d9563a07a5101cc536932bc4db88a53374d
Gitweb: https://git.kernel.org/tip/171a7d9563a07a5101cc536932bc4db88a53374d
Author: Tony Luck <tony.luck@xxxxxxxxx>
AuthorDate: Tue, 03 Sep 2024 10:34:41 -07:00
Committer: Borislav Petkov (AMD) <bp@xxxxxxxxx>
CommitterDate: Wed, 04 Sep 2024 17:58:43 +02:00

extcon: axp288: 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@xxxxxxxxx>
Signed-off-by: Chanwoo Choi <cw00.choi@xxxxxxxxxxx>
Signed-off-by: Borislav Petkov (AMD) <bp@xxxxxxxxx>
Link: https://lore.kernel.org/r/20240903173443.7962-2-tony.luck@xxxxxxxxx
---
drivers/extcon/extcon-axp288.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/extcon/extcon-axp288.c b/drivers/extcon/extcon-axp288.c
index a703a83..d3bcbe8 100644
--- a/drivers/extcon/extcon-axp288.c
+++ b/drivers/extcon/extcon-axp288.c
@@ -108,7 +108,7 @@ struct axp288_extcon_info {
};

static const struct x86_cpu_id cherry_trail_cpu_ids[] = {
- X86_MATCH_INTEL_FAM6_MODEL(ATOM_AIRMONT, NULL),
+ X86_MATCH_VFM(INTEL_ATOM_AIRMONT, NULL),
{}
};