Skip to contentSkip to conversation

drivers:platform/x86:Use ARRAY_SIZE() for the size calculation of the array.

PATCH In review Allen Pais 2 participants 2 messages Sep 13, 2017 – Sep 22, 2017 x86 platform drivers

lore
Share & tools
lore

Allen Pais

author
#0 lore raw

PATCH v3 1/1 drivers:platform/x86:Use ARRAY_SIZE() for the size calculation of the array.

Use ARRAY_SIZE() macro instead of TELEM_EVT_LEN().

v3: Replace TELEM_EVT_LEN() with ARRAY_SIZE().

---
 drivers/platform/x86/intel_telemetry_debugfs.c | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)
drivers/platform/x86/intel_telemetry_debugfs.c +7 -9
index d4fc42b..74e518d 100644
@@ -76,8 +76,6 @@
 #define TELEM_IOSS_DX_D0IX_EVTS		25
 #define TELEM_IOSS_PG_EVTS		30
 
-#define TELEM_EVT_LEN(x) (sizeof(x)/sizeof((x)[0]))
-
 #define TELEM_DEBUGFS_CPU(model, data) \
 	{ X86_VENDOR_INTEL, 6, model, X86_FEATURE_ANY, (unsigned long)&data}
 
@@ -304,13 +302,13 @@ static struct telemetry_debugfs_conf telem_apl_debugfs_conf = {
 	.ioss_d0ix_data = telem_apl_ioss_d0ix_data,
 	.ioss_pg_data = telem_apl_ioss_pg_data,
 
-	.pss_idle_evts = TELEM_EVT_LEN(telem_apl_pss_idle_data),
-	.pcs_idle_blkd_evts = TELEM_EVT_LEN(telem_apl_pcs_idle_blkd_data),
-	.pcs_s0ix_blkd_evts = TELEM_EVT_LEN(telem_apl_pcs_s0ix_blkd_data),
-	.pss_ltr_evts = TELEM_EVT_LEN(telem_apl_pss_ltr_data),
-	.pss_wakeup_evts = TELEM_EVT_LEN(telem_apl_pss_wakeup),
-	.ioss_d0ix_evts = TELEM_EVT_LEN(telem_apl_ioss_d0ix_data),
-	.ioss_pg_evts = TELEM_EVT_LEN(telem_apl_ioss_pg_data),
+	.pss_idle_evts = ARRAY_SIZE(telem_apl_pss_idle_data),
+	.pcs_idle_blkd_evts = ARRAY_SIZE(telem_apl_pcs_idle_blkd_data),
+	.pcs_s0ix_blkd_evts = ARRAY_SIZE(telem_apl_pcs_s0ix_blkd_data),
+	.pss_ltr_evts = ARRAY_SIZE(telem_apl_pss_ltr_data),
+	.pss_wakeup_evts = ARRAY_SIZE(telem_apl_pss_wakeup),
+	.ioss_d0ix_evts = ARRAY_SIZE(telem_apl_ioss_d0ix_data),
+	.ioss_pg_evts = ARRAY_SIZE(telem_apl_ioss_pg_data),
 
 	.pstates_id = TELEM_APL_PSS_PSTATES_ID,
 	.pss_idle_id = TELEM_APL_PSS_IDLE_ID,
Signature · 1 line
2.7.4
#1 lore raw
Quoted 5 lines · Allen Pais

Use ARRAY_SIZE() macro instead of TELEM_EVT_LEN().

v3: Replace TELEM_EVT_LEN() with ARRAY_SIZE().

Thanks Allen, queued for testing with minor changelog changes.

Quoted 1 line

---

Note: in the future, the changelog (Since v1:, Since v2: goes here, below the --- line. Also, don't delete the previous changes. See:

Documentation/process/submitting-patches.rst

14) The canonical patch format

Signature · 2 lines
Darren Hart
VMware Open Source Technology Center