PCI: PM: Switch to new Intel CPU model defines
PATCH RESEND v6 12/49 PCI: PM: Switch to new Intel CPU model defines
New CPU #defines encode vendor and family as well as model.
Signed-off-by Tony Luck <[email protected]>
Acked-by Bjorn Helgaas <[email protected]>
---
Bjorn: You acked this. Are you planning to apply it this cycle? It hasn't shown up in linux-next yet.
drivers/pci/pci-mid.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/pci/pci-mid.c +2 -2
@@ -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 ), {} };
Signature · 1 line
2.45.0
Quoted 8 lines · Tony Luck
New CPU #defines encode vendor and family as well as model.
Signed-off-by Tony Luck <[email protected]>Acked-by Bjorn Helgaas <[email protected]>---
Bjorn: You acked this. Are you planning to apply it this cycle? It hasn't shown up in linux-next yet.
I acked it because I assumed you were going to merge the whole series together, sorry for the miscommunication.
I put it on pci/misc for v6.11.
Quoted 21 lines
drivers/pci/pci-mid.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/pci/pci-mid.c +2
-2@@ -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 ), {} };Signature · 1 line
2.45.0