platform/x86: intel_pmc_core: Convert to INTEL_CPU_FAM6 macro

INTEL_CPU_FAM6() macro provides better abstraction and reduces code size
so use it instead of custom grown ICPU().

Signed-off-by: Rajneesh Bhardwaj <rajneesh.bhardwaj@linux.intel.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Darren Hart (VMware) <dvhart@infradead.org>

diff --git a/drivers/platform/x86/intel_pmc_core.c b/drivers/platform/x86/intel_pmc_core.c
index 08d8b45303dbe40bce7547b4af902e56eff46756..328a0f4cf1910ceaf2eb2ed202d2e533ce909792 100644 (file)
--- a/drivers/platform/x86/intel_pmc_core.c
+++ b/drivers/platform/x86/intel_pmc_core.c
@@ -25,9 +25,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[] = {
@@ -738,11 +735,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),
        {}
 };