diff options
| author |   Thomas Gleixner <tglx@linutronix.de> | 2020-03-20 14:14:02 +0100 |
|---|---|---|
| committer |   Borislav Petkov <bp@suse.de> | 2020-03-24 21:35:06 +0100 |
| commit | 91e503e6f8af97c7da71b3f1e7b2f8a07a36f2f1 (patch) | |
| tree | 5f11b162c7ba13a3dda5497d1e2c761b2a5ef4f0 /drivers/pci/pci-mid.c | |
| parent | mmc: sdhci-acpi: Convert to new X86 CPU match macros (diff) | |
| download | linux-dev-91e503e6f8af97c7da71b3f1e7b2f8a07a36f2f1.tar.xz linux-dev-91e503e6f8af97c7da71b3f1e7b2f8a07a36f2f1.zip | |
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@linutronix.de>
Signed-off-by: Borislav Petkov <bp@suse.de>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
Link: https://lkml.kernel.org/r/20200320131510.393113444@linutronix.de
Diffstat (limited to 'drivers/pci/pci-mid.c')
| -rw-r--r-- | drivers/pci/pci-mid.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/pci/pci-mid.c b/drivers/pci/pci-mid.c index 30fbe2ea6eab..aafd58da3a89 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), {} }; |