diff options
author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2018-08-31 04:34:31 -0400 |
---|---|---|
committer | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2018-10-19 12:23:34 -0400 |
commit | 1a7938a632ce476b01a2dd7676246ca319eb295a (patch) | |
tree | e29ad06581a986a1840ddcbf67f68ec78e4456b0 | |
parent | 8d98b1ef368feeb7720b8b9b6f3bd93f2ad892bc (diff) |
platform/x86: intel_telemetry: Get rid of custom macro
Replace custom grown macro with generic INTEL_CPU_FAM6() one.
No functional change intended.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
-rw-r--r-- | drivers/platform/x86/intel_telemetry_debugfs.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/platform/x86/intel_telemetry_debugfs.c b/drivers/platform/x86/intel_telemetry_debugfs.c index c279490f9488..30988e31c713 100644 --- a/drivers/platform/x86/intel_telemetry_debugfs.c +++ b/drivers/platform/x86/intel_telemetry_debugfs.c | |||
@@ -64,9 +64,6 @@ | |||
64 | #define TELEM_IOSS_DX_D0IX_EVTS 25 | 64 | #define TELEM_IOSS_DX_D0IX_EVTS 25 |
65 | #define TELEM_IOSS_PG_EVTS 30 | 65 | #define TELEM_IOSS_PG_EVTS 30 |
66 | 66 | ||
67 | #define TELEM_DEBUGFS_CPU(model, data) \ | ||
68 | { X86_VENDOR_INTEL, 6, model, X86_FEATURE_ANY, (unsigned long)&data} | ||
69 | |||
70 | #define TELEM_CHECK_AND_PARSE_EVTS(EVTID, EVTNUM, BUF, EVTLOG, EVTDAT, MASK) { \ | 67 | #define TELEM_CHECK_AND_PARSE_EVTS(EVTID, EVTNUM, BUF, EVTLOG, EVTDAT, MASK) { \ |
71 | if (evtlog[index].telem_evtid == (EVTID)) { \ | 68 | if (evtlog[index].telem_evtid == (EVTID)) { \ |
72 | for (idx = 0; idx < (EVTNUM); idx++) \ | 69 | for (idx = 0; idx < (EVTNUM); idx++) \ |
@@ -311,8 +308,8 @@ static struct telemetry_debugfs_conf telem_apl_debugfs_conf = { | |||
311 | }; | 308 | }; |
312 | 309 | ||
313 | static const struct x86_cpu_id telemetry_debugfs_cpu_ids[] = { | 310 | static const struct x86_cpu_id telemetry_debugfs_cpu_ids[] = { |
314 | TELEM_DEBUGFS_CPU(INTEL_FAM6_ATOM_GOLDMONT, telem_apl_debugfs_conf), | 311 | INTEL_CPU_FAM6(ATOM_GOLDMONT, telem_apl_debugfs_conf), |
315 | TELEM_DEBUGFS_CPU(INTEL_FAM6_ATOM_GEMINI_LAKE, telem_apl_debugfs_conf), | 312 | INTEL_CPU_FAM6(ATOM_GEMINI_LAKE, telem_apl_debugfs_conf), |
316 | {} | 313 | {} |
317 | }; | 314 | }; |
318 | 315 | ||