* [PATCH v1 1/2] platform/x86: intel_mid_powerbtn: Get rid of custom ICPU() macro @ 2018-08-31 8:34 Andy Shevchenko 2018-08-31 8:34 ` [PATCH v1 2/2] platform/x86: intel_pmc_core: " Andy Shevchenko 0 siblings, 1 reply; 3+ messages in thread From: Andy Shevchenko @ 2018-08-31 8:34 UTC (permalink / raw) To: Darren Hart, platform-driver-x86, Rajneesh Bhardwaj, Vishwanath Somayaji, linux-kernel Cc: Andy Shevchenko Replace custom grown macro with generic INTEL_CPU_FAM6() one. No functional change intended. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- drivers/platform/x86/intel_mid_powerbtn.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/platform/x86/intel_mid_powerbtn.c b/drivers/platform/x86/intel_mid_powerbtn.c index d79fbf924b13..c93299002169 100644 --- a/drivers/platform/x86/intel_mid_powerbtn.c +++ b/drivers/platform/x86/intel_mid_powerbtn.c @@ -121,12 +121,9 @@ static const struct mid_pb_ddata mrfld_ddata = { .setup = mrfld_setup, }; -#define ICPU(model, ddata) \ - { X86_VENDOR_INTEL, 6, model, X86_FEATURE_ANY, (kernel_ulong_t)&ddata } - static const struct x86_cpu_id mid_pb_cpu_ids[] = { - ICPU(INTEL_FAM6_ATOM_PENWELL, mfld_ddata), - ICPU(INTEL_FAM6_ATOM_MERRIFIELD, mrfld_ddata), + INTEL_CPU_FAM6(ATOM_PENWELL, mfld_ddata), + INTEL_CPU_FAM6(ATOM_MERRIFIELD, mrfld_ddata), {} }; -- 2.18.0 ^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH v1 2/2] platform/x86: intel_pmc_core: Get rid of custom ICPU() macro 2018-08-31 8:34 [PATCH v1 1/2] platform/x86: intel_mid_powerbtn: Get rid of custom ICPU() macro Andy Shevchenko @ 2018-08-31 8:34 ` Andy Shevchenko 2018-08-31 8:52 ` Andy Shevchenko 0 siblings, 1 reply; 3+ messages in thread From: Andy Shevchenko @ 2018-08-31 8:34 UTC (permalink / raw) To: Darren Hart, platform-driver-x86, Rajneesh Bhardwaj, Vishwanath Somayaji, linux-kernel Cc: Andy Shevchenko Replace custom grown macro with generic INTEL_CPU_FAM6() one. No functional change intended. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- drivers/platform/x86/intel_pmc_core.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/drivers/platform/x86/intel_pmc_core.c b/drivers/platform/x86/intel_pmc_core.c index 2d272a3e0176..ab904f238a3d 100644 --- a/drivers/platform/x86/intel_pmc_core.c +++ b/drivers/platform/x86/intel_pmc_core.c @@ -33,9 +33,6 @@ #include "intel_pmc_core.h" -#define ICPU(model, data) \ - { X86_VENDOR_INTEL, 6, model, X86_FEATURE_MWAIT, (kernel_ulong_t)data } - static struct pmc_dev pmc; static const struct pmc_bit_map spt_pll_map[] = { @@ -648,11 +645,11 @@ static inline void pmc_core_dbgfs_unregister(struct pmc_dev *pmcdev) #endif /* CONFIG_DEBUG_FS */ static const struct x86_cpu_id intel_pmc_core_ids[] = { - ICPU(INTEL_FAM6_SKYLAKE_MOBILE, &spt_reg_map), - ICPU(INTEL_FAM6_SKYLAKE_DESKTOP, &spt_reg_map), - ICPU(INTEL_FAM6_KABYLAKE_MOBILE, &spt_reg_map), - ICPU(INTEL_FAM6_KABYLAKE_DESKTOP, &spt_reg_map), - ICPU(INTEL_FAM6_CANNONLAKE_MOBILE, &cnp_reg_map), + INTEL_CPU_FAM6(SKYLAKE_MOBILE, spt_reg_map), + INTEL_CPU_FAM6(SKYLAKE_DESKTOP, spt_reg_map), + INTEL_CPU_FAM6(KABYLAKE_MOBILE, spt_reg_map), + INTEL_CPU_FAM6(KABYLAKE_DESKTOP, spt_reg_map), + INTEL_CPU_FAM6(CANNONLAKE_MOBILE, cnp_reg_map), {} }; -- 2.18.0 ^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v1 2/2] platform/x86: intel_pmc_core: Get rid of custom ICPU() macro 2018-08-31 8:34 ` [PATCH v1 2/2] platform/x86: intel_pmc_core: " Andy Shevchenko @ 2018-08-31 8:52 ` Andy Shevchenko 0 siblings, 0 replies; 3+ messages in thread From: Andy Shevchenko @ 2018-08-31 8:52 UTC (permalink / raw) To: Andy Shevchenko Cc: Darren Hart, Platform Driver, Rajneesh Bhardwaj, Vishwanath Somayaji, Linux Kernel Mailing List On Fri, Aug 31, 2018 at 11:50 AM Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote: > > Replace custom grown macro with generic INTEL_CPU_FAM6() one. > > No functional change intended. Actually there is one, that's why please drop this patch. -- With Best Regards, Andy Shevchenko ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-08-31 8:52 UTC | newest] Thread overview: 3+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2018-08-31 8:34 [PATCH v1 1/2] platform/x86: intel_mid_powerbtn: Get rid of custom ICPU() macro Andy Shevchenko 2018-08-31 8:34 ` [PATCH v1 2/2] platform/x86: intel_pmc_core: " Andy Shevchenko 2018-08-31 8:52 ` Andy Shevchenko
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).