On Fri, Mar 20, 2020 at 02:14:02PM +0100, Thomas Gleixner wrote:
> 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>
> Cc: Bjorn Helgaas <bhelgaas@xxxxxxxxxx>
> Cc: linux-pci@xxxxxxxxxxxxxxx
Acked-by: Bjorn Helgaas <bhelgaas@xxxxxxxxxx>
> ---
> drivers/pci/pci-mid.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> --- a/drivers/pci/pci-mid.c
> +++ b/drivers/pci/pci-mid.c
> @@ -55,15 +55,13 @@ static const struct pci_platform_pm_ops
> .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),
> {}
> };
>
>
