diff options
author | Tony Luck <tony.luck@intel.com> | 2024-05-20 15:46:00 -0700 |
---|---|---|
committer | Dave Hansen <dave.hansen@linux.intel.com> | 2024-05-28 10:59:02 -0700 |
commit | ac6bee4bf73cdfbd2234125d387b1db3a5bbfc19 (patch) | |
tree | 435b747faccb60aff6475edb4493a4dc1b1bae13 /arch/x86/pci | |
parent | 6568fc18c2f62b4f35092e9680fe39f3500f4767 (diff) | |
download | lwn-ac6bee4bf73cdfbd2234125d387b1db3a5bbfc19.tar.gz lwn-ac6bee4bf73cdfbd2234125d387b1db3a5bbfc19.zip |
x86/PCI: 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>
Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
Link: https://lore.kernel.org/all/20240520224620.9480-30-tony.luck%40intel.com
Diffstat (limited to 'arch/x86/pci')
-rw-r--r-- | arch/x86/pci/intel_mid_pci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/pci/intel_mid_pci.c b/arch/x86/pci/intel_mid_pci.c index 8edd62206604..933ff795e53e 100644 --- a/arch/x86/pci/intel_mid_pci.c +++ b/arch/x86/pci/intel_mid_pci.c @@ -216,7 +216,7 @@ static int pci_write(struct pci_bus *bus, unsigned int devfn, int where, } static const struct x86_cpu_id intel_mid_cpu_ids[] = { - X86_MATCH_INTEL_FAM6_MODEL(ATOM_SILVERMONT_MID, NULL), + X86_MATCH_VFM(INTEL_ATOM_SILVERMONT_MID, NULL), {} }; @@ -243,7 +243,7 @@ static int intel_mid_pci_irq_enable(struct pci_dev *dev) model = id->model; switch (model) { - case INTEL_FAM6_ATOM_SILVERMONT_MID: + case VFM_MODEL(INTEL_ATOM_SILVERMONT_MID): polarity_low = false; /* Special treatment for IRQ0 */ |