The following commit has been merged into the x86/cpu branch of tip: Commit-ID: 91e503e6f8af97c7da71b3f1e7b2f8a07a36f2f1 Gitweb: https://git.kernel.org/tip/91e503e6f8af97c7da71b3f1e7b2f8a07a36f2f1 Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx> AuthorDate: Fri, 20 Mar 2020 14:14:02 +01:00 Committer: Borislav Petkov <bp@xxxxxxx> CommitterDate: Tue, 24 Mar 2020 21:35:06 +01:00 PCI: intel-mid: Convert to new X86 CPU match macros The new macro set has a consistent namespace and uses C99 initializers instead of the grufty C89 ones. Get rid the of the local macro wrappers for consistency. Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Signed-off-by: Borislav Petkov <bp@xxxxxxx> Reviewed-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> Acked-by: Bjorn Helgaas <bhelgaas@xxxxxxxxxx> Link: https://lkml.kernel.org/r/20200320131510.393113444@xxxxxxxxxxxxx --- drivers/pci/pci-mid.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/pci/pci-mid.c b/drivers/pci/pci-mid.c index 30fbe2e..aafd58d 100644 --- a/drivers/pci/pci-mid.c +++ b/drivers/pci/pci-mid.c @@ -55,15 +55,13 @@ static const struct pci_platform_pm_ops mid_pci_platform_pm = { .need_resume = mid_pci_need_resume, }; -#define ICPU(model) { X86_VENDOR_INTEL, 6, model, X86_FEATURE_ANY, } - /* * This table should be in sync with the one in * arch/x86/platform/intel-mid/pwr.c. */ static const struct x86_cpu_id lpss_cpu_ids[] = { - ICPU(INTEL_FAM6_ATOM_SALTWELL_MID), - ICPU(INTEL_FAM6_ATOM_SILVERMONT_MID), + X86_MATCH_INTEL_FAM6_MODEL(ATOM_SALTWELL_MID, NULL), + X86_MATCH_INTEL_FAM6_MODEL(ATOM_SILVERMONT_MID, NULL), {} };
![]() |