platform/x86: intel_mid_powerbtn: Get rid of custom ICPU() macro
PATCH 1/2 platform/x86: intel_mid_powerbtn: Get rid of custom ICPU() macro
Replace custom grown macro with generic INTEL_CPU_FAM6() one.
No functional change intended.
Signed-off-by Andy Shevchenko <[email protected]>
--- drivers/platform/x86/intel_mid_powerbtn.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
drivers/platform/x86/intel_mid_powerbtn.c +2 -5
@@ -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), {} };
Signature · 1 line
2.18.0
PATCH 2/2 platform/x86: intel_pmc_core: Get rid of custom ICPU() macro
Replace custom grown macro with generic INTEL_CPU_FAM6() one.
No functional change intended.
Signed-off-by Andy Shevchenko <[email protected]>
--- drivers/platform/x86/intel_pmc_core.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-)
drivers/platform/x86/intel_pmc_core.c +5 -8
@@ -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), {} };
Signature · 1 line
2.18.0
Re: [PATCH v1 2/2] platform/x86: intel_pmc_core: Get rid of custom ICPU() macro
Quoted 4 lines · Andy Shevchenko
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.
Signature · 2 lines
With Best Regards, Andy Shevchenko