From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bjorn Helgaas Subject: Re: [patch 17/22] PCI: intel-mid: Convert to new X86 CPU match macros Date: Fri, 20 Mar 2020 09:30:53 -0500 Message-ID: <20200320143053.GA187287@google.com> References: <20200320131510.393113444@linutronix.de> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Content-Disposition: inline In-Reply-To: <20200320131510.393113444@linutronix.de> Sender: linux-hwmon-owner@vger.kernel.org To: Thomas Gleixner Cc: LKML , x86@kernel.org, Greg Kroah-Hartman , Mark Gross , Tony Luck , linux-pci@vger.kernel.org, Paolo Bonzini , Darren Hart , Andy Shevchenko , "Rafael J. Wysocki" , Len Brown , linux-acpi@vger.kernel.org, Viresh Kumar , linux-pm@vger.kernel.org, Srinivas Pandruvada , linux-edac@vger.kernel.org, platform-driver-x86@vger.kernel.org, Jean Delvare , Guenter Roeck , linux-hwmon@vger.kernel.org, Zhang Rui , Daniel Lezcano List-Id: platform-driver-x86.vger.kernel.org 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 > Cc: Bjorn Helgaas > Cc: linux-pci@vger.kernel.org Acked-by: Bjorn Helgaas > --- > 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), > {} > }; > >