diff --git a/drivers/net/wireless/ath/ath12k/debugfs_htt_stats.c b/drivers/net/wireless/ath/ath12k/debugfs_htt_stats.c
index 799b865b89e5..a50ffbc081f7 100644
--- a/drivers/net/wireless/ath/ath12k/debugfs_htt_stats.c
+++ b/drivers/net/wireless/ath/ath12k/debugfs_htt_stats.c
@@ -11,8 +11,13 @@
 #include "dp_tx.h"
 #include "dp_rx.h"
 
+#define print_array_to_buf_index(buf, offset, header, stats_index, \
+			 array, footer) \
+	_print_array_to_buf_index(buf, offset, header, stats_index, \
+		array, ARRAY_SIZE(array), footer \
+	)
 static u32
-print_array_to_buf_index(u8 *buf, u32 offset, const char *header, u32 stats_index,
+_print_array_to_buf_index(u8 *buf, u32 offset, const char *header, u32 stats_index,
 			 const __le32 *array, u32 array_len, const char *footer)
 {
 	int index = 0;
@@ -40,11 +45,16 @@ print_array_to_buf_index(u8 *buf, u32 offset, const char *header, u32 stats_inde
 	return index;
 }
 
+#define print_array_to_buf(buf, offset, header, array, footer) \
+	_print_array_to_buf(buf, offset, header, \
+		array, ARRAY_SIZE(array), \
+		footer \
+	)
 static u32
-print_array_to_buf(u8 *buf, u32 offset, const char *header,
+_print_array_to_buf(u8 *buf, u32 offset, const char *header,
 		   const __le32 *array, u32 array_len, const char *footer)
 {
-	return print_array_to_buf_index(buf, offset, header, 0, array, array_len,
+	return _print_array_to_buf_index(buf, offset, header, 0, array, array_len,
 					footer);
 }
 
@@ -253,7 +263,7 @@ htt_print_tx_pdev_stats_urrn_tlv(const void *tag_buf,
 	len += scnprintf(buf + len, buf_len - len,
 			"HTT_TX_PDEV_STATS_URRN_TLV:\n");
 
-	len += print_array_to_buf(buf, len, "urrn_stats", htt_stats_buf->urrn_stats,
+	len += _print_array_to_buf(buf, len, "urrn_stats", htt_stats_buf->urrn_stats,
 				  num_elems, "\n\n");
 
 	stats_req->buf_len = len;
@@ -274,7 +284,7 @@ htt_print_tx_pdev_stats_flush_tlv(const void *tag_buf,
 	len += scnprintf(buf + len, buf_len - len,
 			 "HTT_TX_PDEV_STATS_FLUSH_TLV:\n");
 
-	len += print_array_to_buf(buf, len, "flush_errs", htt_stats_buf->flush_errs,
+	len += _print_array_to_buf(buf, len, "flush_errs", htt_stats_buf->flush_errs,
 				  num_elems, "\n\n");
 
 	stats_req->buf_len = len;
@@ -295,7 +305,7 @@ htt_print_tx_pdev_stats_sifs_tlv(const void *tag_buf,
 	len += scnprintf(buf + len, buf_len - len,
 			 "HTT_TX_PDEV_STATS_SIFS_TLV:\n");
 
-	len += print_array_to_buf(buf, len, "sifs_status", htt_stats_buf->sifs_status,
+	len += _print_array_to_buf(buf, len, "sifs_status", htt_stats_buf->sifs_status,
 				  num_elems, "\n\n");
 
 	stats_req->buf_len = len;
@@ -407,7 +417,7 @@ htt_print_tx_pdev_stats_sifs_hist_tlv(const void *tag_buf,
 	len += scnprintf(buf + len, buf_len - len,
 			 "HTT_TX_PDEV_STATS_SIFS_HIST_TLV:\n");
 
-	len += print_array_to_buf(buf, len, "sifs_hist_status",
+	len += _print_array_to_buf(buf, len, "sifs_hist_status",
 				  htt_stats_buf->sifs_hist_status, num_elems, "\n\n");
 
 	stats_req->buf_len = len;
@@ -429,7 +439,7 @@ htt_print_pdev_ctrl_path_tx_stats_tlv(const void *tag_buf, u16 tag_len,
 			 "HTT_TX_PDEV_STATS_CTRL_PATH_TX_STATS:\n");
 	len += print_array_to_buf(buf, len, "fw_tx_mgmt_subtype",
 				 htt_stats_buf->fw_tx_mgmt_subtype,
-				 ATH12K_HTT_STATS_SUBTYPE_MAX, "\n\n");
+				 "\n\n");
 
 	stats_req->buf_len = len;
 }
@@ -557,7 +567,7 @@ ath12k_htt_print_sched_txq_cmd_posted_tlv(const void *tag_buf,
 	u16 num_elements = tag_len >> 2;
 
 	len += scnprintf(buf + len, buf_len - len, "HTT_SCHED_TXQ_CMD_POSTED_TLV:\n");
-	len += print_array_to_buf(buf, len, "sched_cmd_posted",
+	len += _print_array_to_buf(buf, len, "sched_cmd_posted",
 				  htt_stats_buf->sched_cmd_posted, num_elements, "\n\n");
 
 	stats_req->buf_len = len;
@@ -575,7 +585,7 @@ ath12k_htt_print_sched_txq_cmd_reaped_tlv(const void *tag_buf,
 	u16 num_elements = tag_len >> 2;
 
 	len += scnprintf(buf + len, buf_len - len, "HTT_SCHED_TXQ_CMD_REAPED_TLV:\n");
-	len += print_array_to_buf(buf, len, "sched_cmd_reaped",
+	len += _print_array_to_buf(buf, len, "sched_cmd_reaped",
 				  htt_stats_buf->sched_cmd_reaped, num_elements, "\n\n");
 
 	stats_req->buf_len = len;
@@ -595,7 +605,7 @@ ath12k_htt_print_sched_txq_sched_order_su_tlv(const void *tag_buf,
 
 	len += scnprintf(buf + len, buf_len - len,
 			 "HTT_SCHED_TXQ_SCHED_ORDER_SU_TLV:\n");
-	len += print_array_to_buf(buf, len, "sched_order_su",
+	len += _print_array_to_buf(buf, len, "sched_order_su",
 				  htt_stats_buf->sched_order_su,
 				  sched_order_su_num_entries, "\n\n");
 
@@ -616,7 +626,7 @@ ath12k_htt_print_sched_txq_sched_ineligibility_tlv(const void *tag_buf,
 
 	len += scnprintf(buf + len, buf_len - len,
 			 "HTT_SCHED_TXQ_SCHED_INELIGIBILITY:\n");
-	len += print_array_to_buf(buf, len, "sched_ineligibility",
+	len += _print_array_to_buf(buf, len, "sched_ineligibility",
 				  htt_stats_buf->sched_ineligibility,
 				  sched_ineligibility_num_entries, "\n\n");
 
@@ -638,7 +648,7 @@ ath12k_htt_print_sched_txq_supercycle_trigger_tlv(const void *tag_buf,
 
 	len += scnprintf(buf + len, buf_len - len,
 			 "HTT_SCHED_TXQ_SUPERCYCLE_TRIGGER:\n");
-	len += print_array_to_buf(buf, len, "supercycle_triggers",
+	len += _print_array_to_buf(buf, len, "supercycle_triggers",
 				  htt_stats_buf->supercycle_triggers, num_elems, "\n\n");
 
 	stats_req->buf_len = len;
@@ -1043,7 +1053,7 @@ ath12k_htt_print_tx_tqm_gen_mpdu_stats_tlv(const void *tag_buf, u16 tag_len,
 	u16 num_elements = tag_len >> 2;
 
 	len += scnprintf(buf + len, buf_len - len, "HTT_TX_TQM_GEN_MPDU_STATS_TLV:\n");
-	len += print_array_to_buf(buf, len, "gen_mpdu_end_reason",
+	len += _print_array_to_buf(buf, len, "gen_mpdu_end_reason",
 				  htt_stats_buf->gen_mpdu_end_reason, num_elements,
 				  "\n\n");
 
@@ -1062,7 +1072,7 @@ ath12k_htt_print_tx_tqm_list_mpdu_stats_tlv(const void *tag_buf, u16 tag_len,
 			      ATH12K_HTT_TX_TQM_MAX_LIST_MPDU_END_REASON);
 
 	len += scnprintf(buf + len, buf_len - len, "HTT_TX_TQM_LIST_MPDU_STATS_TLV:\n");
-	len += print_array_to_buf(buf, len, "list_mpdu_end_reason",
+	len += _print_array_to_buf(buf, len, "list_mpdu_end_reason",
 				  htt_stats_buf->list_mpdu_end_reason, num_elems, "\n\n");
 
 	stats_req->buf_len = len;
@@ -1080,7 +1090,7 @@ ath12k_htt_print_tx_tqm_list_mpdu_cnt_tlv(const void *tag_buf, u16 tag_len,
 			      ATH12K_HTT_TX_TQM_MAX_LIST_MPDU_CNT_HISTOGRAM_BINS);
 
 	len += scnprintf(buf + len, buf_len - len, "HTT_TX_TQM_LIST_MPDU_CNT_TLV_V:\n");
-	len += print_array_to_buf(buf, len, "list_mpdu_cnt_hist",
+	len += _print_array_to_buf(buf, len, "list_mpdu_cnt_hist",
 				  htt_stats_buf->list_mpdu_cnt_hist, num_elems, "\n\n");
 
 	stats_req->buf_len = len;
@@ -1562,7 +1572,7 @@ ath12k_htt_print_tx_selfgen_ac_stats_tlv(const void *tag_buf, u16 tag_len,
 			 le32_to_cpu(htt_stats_buf->ac_mu_mimo_ndp));
 	len += print_array_to_buf_index(buf, len, "ac_mu_mimo_brpollX_tried = ", 1,
 					htt_stats_buf->ac_mu_mimo_brpoll,
-					ATH12K_HTT_TX_NUM_AC_MUMIMO_USER_STATS, "\n\n");
+					"\n\n");
 
 	stats_req->buf_len = len;
 }
@@ -1590,7 +1600,7 @@ ath12k_htt_print_tx_selfgen_ax_stats_tlv(const void *tag_buf, u16 tag_len,
 			 le32_to_cpu(htt_stats_buf->ax_mu_mimo_ndp));
 	len += print_array_to_buf_index(buf, len, "ax_mu_mimo_brpollX_tried = ", 1,
 					htt_stats_buf->ax_mu_mimo_brpoll,
-					ATH12K_HTT_TX_NUM_AX_MUMIMO_USER_STATS, "\n");
+					"\n");
 	len += scnprintf(buf + len, buf_len - len, "ax_basic_trigger = %u\n",
 			 le32_to_cpu(htt_stats_buf->ax_basic_trigger));
 	len += scnprintf(buf + len, buf_len - len, "ax_ulmumimo_total_trigger = %u\n",
@@ -1636,15 +1646,12 @@ ath12k_htt_print_tx_selfgen_be_stats_tlv(const void *tag_buf, u16 tag_len,
 			 le32_to_cpu(htt_stats_buf->be_mu_mimo_ndp));
 	len += print_array_to_buf_index(buf, len, "be_mu_mimo_brpollX_queued = ", 1,
 					htt_stats_buf->be_mu_mimo_brpoll_queued,
-					ATH12K_HTT_TX_NUM_BE_MUMIMO_USER_STATS - 1,
 					"\n");
 	len += print_array_to_buf_index(buf, len, "be_mu_mimo_brpollX_tried = ", 1,
 					htt_stats_buf->be_mu_mimo_brpoll,
-					ATH12K_HTT_TX_NUM_BE_MUMIMO_USER_STATS - 1,
 					"\n");
 	len += print_array_to_buf(buf, len, "be_ul_mumimo_trigger = ",
-				  htt_stats_buf->be_ul_mumimo_trigger,
-				  ATH12K_HTT_TX_NUM_BE_MUMIMO_USER_STATS, "\n");
+				  htt_stats_buf->be_ul_mumimo_trigger, "\n");
 	len += scnprintf(buf + len, buf_len - len, "be_basic_trigger = %u\n",
 			 le32_to_cpu(htt_stats_buf->be_basic_trigger));
 	len += scnprintf(buf + len, buf_len - len, "be_ulmumimo_total_trigger = %u\n",
@@ -1713,7 +1720,6 @@ ath12k_htt_print_tx_selfgen_ax_err_stats_tlv(const void *tag_buf, u16 tag_len,
 			 le32_to_cpu(htt_stats_buf->ax_mu_mimo_ndp_err));
 	len += print_array_to_buf_index(buf, len, "ax_mu_mimo_brpX_err", 1,
 					htt_stats_buf->ax_mu_mimo_brp_err,
-					ATH12K_HTT_TX_NUM_AX_MUMIMO_USER_STATS - 1,
 					"\n");
 	len += scnprintf(buf + len, buf_len - len, "ax_basic_trigger_err = %u\n",
 			 le32_to_cpu(htt_stats_buf->ax_basic_trigger_err));
@@ -1760,18 +1766,14 @@ ath12k_htt_print_tx_selfgen_be_err_stats_tlv(const void *tag_buf, u16 tag_len,
 			 le32_to_cpu(htt_stats_buf->be_mu_mimo_ndp_flushed));
 	len += print_array_to_buf_index(buf, len, "be_mu_mimo_brpX_err", 1,
 					htt_stats_buf->be_mu_mimo_brp_err,
-					ATH12K_HTT_TX_NUM_BE_MUMIMO_USER_STATS - 1,
 					"\n");
 	len += print_array_to_buf_index(buf, len, "be_mu_mimo_brpollX_flushed", 1,
 					htt_stats_buf->be_mu_mimo_brpoll_flushed,
-					ATH12K_HTT_TX_NUM_BE_MUMIMO_USER_STATS - 1,
 					"\n");
 	len += print_array_to_buf(buf, len, "be_mu_mimo_num_cbf_rcvd_on_brp_err",
-				  htt_stats_buf->be_mu_mimo_brp_err_num_cbf_rxd,
-				  ATH12K_HTT_TX_NUM_BE_MUMIMO_USER_STATS, "\n");
+				  htt_stats_buf->be_mu_mimo_brp_err_num_cbf_rxd, "\n");
 	len += print_array_to_buf(buf, len, "be_ul_mumimo_trigger_err",
-				  htt_stats_buf->be_ul_mumimo_trigger_err,
-				  ATH12K_HTT_TX_NUM_BE_MUMIMO_USER_STATS, "\n");
+				  htt_stats_buf->be_ul_mumimo_trigger_err, "\n");
 	len += scnprintf(buf + len, buf_len - len, "be_basic_trigger_err = %u\n",
 			 le32_to_cpu(htt_stats_buf->be_basic_trigger_err));
 	len += scnprintf(buf + len, buf_len - len, "be_ulmumimo_total_trig_err = %u\n",
@@ -1802,29 +1804,21 @@ ath12k_htt_print_tx_selfgen_ac_sched_status_stats_tlv(const void *tag_buf, u16 t
 	len += scnprintf(buf + len, buf_len - len,
 			 "HTT_TX_SELFGEN_AC_SCHED_STATUS_STATS_TLV:\n");
 	len += print_array_to_buf(buf, len, "ac_su_ndpa_sch_status",
-				  htt_stats_buf->ac_su_ndpa_sch_status,
-				  ATH12K_HTT_TX_PDEV_STATS_NUM_TX_ERR_STATUS, "\n");
+				  htt_stats_buf->ac_su_ndpa_sch_status, "\n");
 	len += print_array_to_buf(buf, len, "ac_su_ndp_sch_status",
-				  htt_stats_buf->ac_su_ndp_sch_status,
-				  ATH12K_HTT_TX_PDEV_STATS_NUM_TX_ERR_STATUS, "\n");
+				  htt_stats_buf->ac_su_ndp_sch_status, "\n");
 	len += print_array_to_buf(buf, len, "ac_mu_mimo_ndpa_sch_status",
-				  htt_stats_buf->ac_mu_mimo_ndpa_sch_status,
-				  ATH12K_HTT_TX_PDEV_STATS_NUM_TX_ERR_STATUS, "\n");
+				  htt_stats_buf->ac_mu_mimo_ndpa_sch_status, "\n");
 	len += print_array_to_buf(buf, len, "ac_mu_mimo_ndp_sch_status",
-				  htt_stats_buf->ac_mu_mimo_ndp_sch_status,
-				  ATH12K_HTT_TX_PDEV_STATS_NUM_TX_ERR_STATUS, "\n");
+				  htt_stats_buf->ac_mu_mimo_ndp_sch_status, "\n");
 	len += print_array_to_buf(buf, len, "ac_mu_mimo_brp_sch_status",
-				  htt_stats_buf->ac_mu_mimo_brp_sch_status,
-				  ATH12K_HTT_TX_PDEV_STATS_NUM_TX_ERR_STATUS, "\n");
+				  htt_stats_buf->ac_mu_mimo_brp_sch_status, "\n");
 	len += print_array_to_buf(buf, len, "ac_su_ndp_sch_flag_err",
-				  htt_stats_buf->ac_su_ndp_sch_flag_err,
-				  ATH12K_HTT_TX_SELFGEN_SCH_TSFLAG_ERR_STATS, "\n");
+				  htt_stats_buf->ac_su_ndp_sch_flag_err, "\n");
 	len += print_array_to_buf(buf, len, "ac_mu_mimo_ndp_sch_flag_err",
-				  htt_stats_buf->ac_mu_mimo_ndp_sch_flag_err,
-				  ATH12K_HTT_TX_SELFGEN_SCH_TSFLAG_ERR_STATS, "\n");
+				  htt_stats_buf->ac_mu_mimo_ndp_sch_flag_err, "\n");
 	len += print_array_to_buf(buf, len, "ac_mu_mimo_brp_sch_flag_err",
-				  htt_stats_buf->ac_mu_mimo_brp_sch_flag_err,
-				  ATH12K_HTT_TX_SELFGEN_SCH_TSFLAG_ERR_STATS, "\n\n");
+				  htt_stats_buf->ac_mu_mimo_brp_sch_flag_err, "\n\n");
 
 	stats->buf_len = len;
 }
@@ -1845,47 +1839,33 @@ ath12k_htt_print_tx_selfgen_ax_sched_status_stats_tlv(const void *tag_buf, u16 t
 	len += scnprintf(buf + len, buf_len - len,
 			 "HTT_TX_SELFGEN_AX_SCHED_STATUS_STATS_TLV:\n");
 	len += print_array_to_buf(buf, len, "ax_su_ndpa_sch_status",
-				  htt_stats_buf->ax_su_ndpa_sch_status,
-				  ATH12K_HTT_TX_PDEV_STATS_NUM_TX_ERR_STATUS, "\n");
+				  htt_stats_buf->ax_su_ndpa_sch_status, "\n");
 	len += print_array_to_buf(buf, len, "ax_su_ndp_sch_status",
-				  htt_stats_buf->ax_su_ndp_sch_status,
-				  ATH12K_HTT_TX_PDEV_STATS_NUM_TX_ERR_STATUS, "\n");
+				  htt_stats_buf->ax_su_ndp_sch_status, "\n");
 	len += print_array_to_buf(buf, len, "ax_mu_mimo_ndpa_sch_status",
-				  htt_stats_buf->ax_mu_mimo_ndpa_sch_status,
-				  ATH12K_HTT_TX_PDEV_STATS_NUM_TX_ERR_STATUS, "\n");
+				  htt_stats_buf->ax_mu_mimo_ndpa_sch_status, "\n");
 	len += print_array_to_buf(buf, len, "ax_mu_mimo_ndp_sch_status",
-				  htt_stats_buf->ax_mu_mimo_ndp_sch_status,
-				  ATH12K_HTT_TX_PDEV_STATS_NUM_TX_ERR_STATUS, "\n");
+				  htt_stats_buf->ax_mu_mimo_ndp_sch_status, "\n");
 	len += print_array_to_buf(buf, len, "ax_mu_brp_sch_status",
-				  htt_stats_buf->ax_mu_brp_sch_status,
-				  ATH12K_HTT_TX_PDEV_STATS_NUM_TX_ERR_STATUS, "\n");
+				  htt_stats_buf->ax_mu_brp_sch_status, "\n");
 	len += print_array_to_buf(buf, len, "ax_mu_bar_sch_status",
-				  htt_stats_buf->ax_mu_bar_sch_status,
-				  ATH12K_HTT_TX_PDEV_STATS_NUM_TX_ERR_STATUS, "\n");
+				  htt_stats_buf->ax_mu_bar_sch_status, "\n");
 	len += print_array_to_buf(buf, len, "ax_basic_trig_sch_status",
-				  htt_stats_buf->ax_basic_trig_sch_status,
-				  ATH12K_HTT_TX_PDEV_STATS_NUM_TX_ERR_STATUS, "\n");
+				  htt_stats_buf->ax_basic_trig_sch_status, "\n");
 	len += print_array_to_buf(buf, len, "ax_su_ndp_sch_flag_err",
-				  htt_stats_buf->ax_su_ndp_sch_flag_err,
-				  ATH12K_HTT_TX_SELFGEN_SCH_TSFLAG_ERR_STATS, "\n");
+				  htt_stats_buf->ax_su_ndp_sch_flag_err, "\n");
 	len += print_array_to_buf(buf, len, "ax_mu_mimo_ndp_sch_flag_err",
-				  htt_stats_buf->ax_mu_mimo_ndp_sch_flag_err,
-				  ATH12K_HTT_TX_SELFGEN_SCH_TSFLAG_ERR_STATS, "\n");
+				  htt_stats_buf->ax_mu_mimo_ndp_sch_flag_err, "\n");
 	len += print_array_to_buf(buf, len, "ax_mu_brp_sch_flag_err",
-				  htt_stats_buf->ax_mu_brp_sch_flag_err,
-				  ATH12K_HTT_TX_SELFGEN_SCH_TSFLAG_ERR_STATS, "\n");
+				  htt_stats_buf->ax_mu_brp_sch_flag_err, "\n");
 	len += print_array_to_buf(buf, len, "ax_mu_bar_sch_flag_err",
-				  htt_stats_buf->ax_mu_bar_sch_flag_err,
-				  ATH12K_HTT_TX_SELFGEN_SCH_TSFLAG_ERR_STATS, "\n");
+				  htt_stats_buf->ax_mu_bar_sch_flag_err, "\n");
 	len += print_array_to_buf(buf, len, "ax_basic_trig_sch_flag_err",
-				  htt_stats_buf->ax_basic_trig_sch_flag_err,
-				  ATH12K_HTT_TX_SELFGEN_SCH_TSFLAG_ERR_STATS, "\n");
+				  htt_stats_buf->ax_basic_trig_sch_flag_err, "\n");
 	len += print_array_to_buf(buf, len, "ax_ulmumimo_trig_sch_status",
-				  htt_stats_buf->ax_ulmumimo_trig_sch_status,
-				  ATH12K_HTT_TX_PDEV_STATS_NUM_TX_ERR_STATUS, "\n");
+				  htt_stats_buf->ax_ulmumimo_trig_sch_status, "\n");
 	len += print_array_to_buf(buf, len, "ax_ulmumimo_trig_sch_flag_err",
-				  htt_stats_buf->ax_ulmumimo_trig_sch_flag_err,
-				  ATH12K_HTT_TX_SELFGEN_SCH_TSFLAG_ERR_STATS, "\n\n");
+				  htt_stats_buf->ax_ulmumimo_trig_sch_flag_err, "\n\n");
 
 	stats->buf_len = len;
 }
@@ -1906,47 +1886,33 @@ ath12k_htt_print_tx_selfgen_be_sched_status_stats_tlv(const void *tag_buf, u16 t
 	len += scnprintf(buf + len, buf_len - len,
 			 "HTT_TX_SELFGEN_BE_SCHED_STATUS_STATS_TLV:\n");
 	len += print_array_to_buf(buf, len, "be_su_ndpa_sch_status",
-				  htt_stats_buf->be_su_ndpa_sch_status,
-				  ATH12K_HTT_TX_PDEV_STATS_NUM_TX_ERR_STATUS, "\n");
+				  htt_stats_buf->be_su_ndpa_sch_status, "\n");
 	len += print_array_to_buf(buf, len, "be_su_ndp_sch_status",
-				  htt_stats_buf->be_su_ndp_sch_status,
-				  ATH12K_HTT_TX_PDEV_STATS_NUM_TX_ERR_STATUS, "\n");
+				  htt_stats_buf->be_su_ndp_sch_status, "\n");
 	len += print_array_to_buf(buf, len, "be_mu_mimo_ndpa_sch_status",
-				  htt_stats_buf->be_mu_mimo_ndpa_sch_status,
-				  ATH12K_HTT_TX_PDEV_STATS_NUM_TX_ERR_STATUS, "\n");
+				  htt_stats_buf->be_mu_mimo_ndpa_sch_status, "\n");
 	len += print_array_to_buf(buf, len, "be_mu_mimo_ndp_sch_status",
-				  htt_stats_buf->be_mu_mimo_ndp_sch_status,
-				  ATH12K_HTT_TX_PDEV_STATS_NUM_TX_ERR_STATUS, "\n");
+				  htt_stats_buf->be_mu_mimo_ndp_sch_status, "\n");
 	len += print_array_to_buf(buf, len, "be_mu_brp_sch_status",
-				  htt_stats_buf->be_mu_brp_sch_status,
-				  ATH12K_HTT_TX_PDEV_STATS_NUM_TX_ERR_STATUS, "\n");
+				  htt_stats_buf->be_mu_brp_sch_status, "\n");
 	len += print_array_to_buf(buf, len, "be_mu_bar_sch_status",
-				  htt_stats_buf->be_mu_bar_sch_status,
-				  ATH12K_HTT_TX_PDEV_STATS_NUM_TX_ERR_STATUS, "\n");
+				  htt_stats_buf->be_mu_bar_sch_status, "\n");
 	len += print_array_to_buf(buf, len, "be_basic_trig_sch_status",
-				  htt_stats_buf->be_basic_trig_sch_status,
-				  ATH12K_HTT_TX_PDEV_STATS_NUM_TX_ERR_STATUS, "\n");
+				  htt_stats_buf->be_basic_trig_sch_status, "\n");
 	len += print_array_to_buf(buf, len, "be_su_ndp_sch_flag_err",
-				  htt_stats_buf->be_su_ndp_sch_flag_err,
-				  ATH12K_HTT_TX_SELFGEN_SCH_TSFLAG_ERR_STATS, "\n");
+				  htt_stats_buf->be_su_ndp_sch_flag_err, "\n");
 	len += print_array_to_buf(buf, len, "be_mu_mimo_ndp_sch_flag_err",
-				  htt_stats_buf->be_mu_mimo_ndp_sch_flag_err,
-				  ATH12K_HTT_TX_SELFGEN_SCH_TSFLAG_ERR_STATS, "\n");
+				  htt_stats_buf->be_mu_mimo_ndp_sch_flag_err, "\n");
 	len += print_array_to_buf(buf, len, "be_mu_brp_sch_flag_err",
-				  htt_stats_buf->be_mu_brp_sch_flag_err,
-				  ATH12K_HTT_TX_SELFGEN_SCH_TSFLAG_ERR_STATS, "\n");
+				  htt_stats_buf->be_mu_brp_sch_flag_err, "\n");
 	len += print_array_to_buf(buf, len, "be_mu_bar_sch_flag_err",
-				  htt_stats_buf->be_mu_bar_sch_flag_err,
-				  ATH12K_HTT_TX_SELFGEN_SCH_TSFLAG_ERR_STATS, "\n");
+				  htt_stats_buf->be_mu_bar_sch_flag_err, "\n");
 	len += print_array_to_buf(buf, len, "be_basic_trig_sch_flag_err",
-				  htt_stats_buf->be_basic_trig_sch_flag_err,
-				  ATH12K_HTT_TX_SELFGEN_SCH_TSFLAG_ERR_STATS, "\n");
+				  htt_stats_buf->be_basic_trig_sch_flag_err, "\n");
 	len += print_array_to_buf(buf, len, "be_basic_trig_sch_flag_err",
-				  htt_stats_buf->be_basic_trig_sch_flag_err,
-				  ATH12K_HTT_TX_PDEV_STATS_NUM_TX_ERR_STATUS, "\n");
+				  htt_stats_buf->be_basic_trig_sch_flag_err, "\n");
 	len += print_array_to_buf(buf, len, "be_ulmumimo_trig_sch_flag_err",
-				  htt_stats_buf->be_ulmumimo_trig_sch_flag_err,
-				  ATH12K_HTT_TX_SELFGEN_SCH_TSFLAG_ERR_STATS, "\n\n");
+				  htt_stats_buf->be_ulmumimo_trig_sch_flag_err, "\n\n");
 
 	stats->buf_len = len;
 }
@@ -2116,7 +2082,7 @@ ath12k_htt_print_sfm_client_user_tlv(const void *tag_buf, u16 tag_len,
 	u16 num_elems = tag_len >> 2;
 
 	len += scnprintf(buf + len, buf_len - len, "HTT_SFM_CLIENT_USER_TLV:\n");
-	len += print_array_to_buf(buf, len, "dwords_used_by_user_n",
+	len += _print_array_to_buf(buf, len, "dwords_used_by_user_n",
 				  htt_stats_buf->dwords_used_by_user_n,
 				  num_elems, "\n\n");
 
@@ -2256,33 +2222,28 @@ ath12k_htt_print_tx_pdev_mumimo_grp_stats_tlv(const void *tag_buf, u16 tag_len,
 	len += scnprintf(buf + len, buf_len - len, "HTT_TX_PDEV_MUMIMO_GRP_STATS:\n");
 	len += print_array_to_buf(buf, len,
 				  "dl_mumimo_grp_tputs_observed (per bin = 300 mbps)",
-				  htt_stats_buf->dl_mumimo_grp_tputs,
-				  ATH12K_HTT_STATS_MUMIMO_TPUT_NUM_BINS, "\n");
+				  htt_stats_buf->dl_mumimo_grp_tputs, "\n");
 	len += print_array_to_buf(buf, len, "dl_mumimo_grp eligible",
-				  htt_stats_buf->dl_mumimo_grp_eligible,
-				  ATH12K_HTT_STATS_NUM_MAX_MUMIMO_SZ, "\n");
+				  htt_stats_buf->dl_mumimo_grp_eligible, "\n");
 	len += print_array_to_buf(buf, len, "dl_mumimo_grp_ineligible",
-				  htt_stats_buf->dl_mumimo_grp_ineligible,
-				  ATH12K_HTT_STATS_NUM_MAX_MUMIMO_SZ, "\n");
+				  htt_stats_buf->dl_mumimo_grp_ineligible, "\n");
 	len += scnprintf(buf + len, buf_len - len, "dl_mumimo_grp_invalid:\n");
 	for (j = 0; j < ATH12K_HTT_STATS_NUM_MAX_MUMIMO_SZ; j++) {
 		len += scnprintf(buf + len, buf_len - len, "grp_id = %u", j);
-		len += print_array_to_buf(buf, len, "",
+		len += _print_array_to_buf(buf, len, "",
 					  htt_stats_buf->dl_mumimo_grp_invalid,
 					  ATH12K_HTT_STATS_MAX_INVALID_REASON_CODE,
 					  "\n");
 	}
 
 	len += print_array_to_buf(buf, len, "ul_mumimo_grp_best_grp_size",
-				  htt_stats_buf->ul_mumimo_grp_best_grp_size,
-				  ATH12K_HTT_STATS_NUM_MAX_MUMIMO_SZ, "\n");
+				  htt_stats_buf->ul_mumimo_grp_best_grp_size, "\n");
 	len += print_array_to_buf_index(buf, len, "ul_mumimo_grp_best_num_usrs = ", 1,
 					htt_stats_buf->ul_mumimo_grp_best_usrs,
-					ATH12K_HTT_TX_NUM_AX_MUMIMO_USER_STATS, "\n");
+					"\n");
 	len += print_array_to_buf(buf, len,
 				  "ul_mumimo_grp_tputs_observed (per bin = 300 mbps)",
-				  htt_stats_buf->ul_mumimo_grp_tputs,
-				  ATH12K_HTT_STATS_MUMIMO_TPUT_NUM_BINS, "\n\n");
+				  htt_stats_buf->ul_mumimo_grp_tputs, "\n\n");
 
 	stats_req->buf_len = len;
 }
@@ -2608,46 +2569,46 @@ ath12k_htt_print_pdev_sched_algo_ofdma_stats_tlv(const void *tag_buf, u16 tag_le
 			 u32_get_bits(mac_id_word, ATH12K_HTT_STATS_MAC_ID));
 	len += print_array_to_buf(buf, len, "rate_based_dlofdma_enabled_count",
 				  htt_stats_buf->rate_based_dlofdma_enabled_cnt,
-				  ATH12K_HTT_NUM_AC_WMM, "\n");
+				  "\n");
 	len += print_array_to_buf(buf, len, "rate_based_dlofdma_disabled_count",
 				  htt_stats_buf->rate_based_dlofdma_disabled_cnt,
-				  ATH12K_HTT_NUM_AC_WMM, "\n");
+				  "\n");
 	len += print_array_to_buf(buf, len, "rate_based_dlofdma_probing_count",
 				  htt_stats_buf->rate_based_dlofdma_disabled_cnt,
-				  ATH12K_HTT_NUM_AC_WMM, "\n");
+				  "\n");
 	len += print_array_to_buf(buf, len, "rate_based_dlofdma_monitoring_count",
 				  htt_stats_buf->rate_based_dlofdma_monitor_cnt,
-				  ATH12K_HTT_NUM_AC_WMM, "\n");
+				  "\n");
 	len += print_array_to_buf(buf, len, "chan_acc_lat_based_dlofdma_enabled_count",
 				  htt_stats_buf->chan_acc_lat_based_dlofdma_enabled_cnt,
-				  ATH12K_HTT_NUM_AC_WMM, "\n");
+				  "\n");
 	len += print_array_to_buf(buf, len, "chan_acc_lat_based_dlofdma_disabled_count",
 				  htt_stats_buf->chan_acc_lat_based_dlofdma_disabled_cnt,
-				  ATH12K_HTT_NUM_AC_WMM, "\n");
+				  "\n");
 	len += print_array_to_buf(buf, len, "chan_acc_lat_based_dlofdma_monitoring_count",
 				  htt_stats_buf->chan_acc_lat_based_dlofdma_monitor_cnt,
-				  ATH12K_HTT_NUM_AC_WMM, "\n");
+				  "\n");
 	len += print_array_to_buf(buf, len, "downgrade_to_dl_su_ru_alloc_fail",
 				  htt_stats_buf->downgrade_to_dl_su_ru_alloc_fail,
-				  ATH12K_HTT_NUM_AC_WMM, "\n");
+				  "\n");
 	len += print_array_to_buf(buf, len, "candidate_list_single_user_disable_ofdma",
 				  htt_stats_buf->candidate_list_single_user_disable_ofdma,
-				  ATH12K_HTT_NUM_AC_WMM, "\n");
+				  "\n");
 	len += print_array_to_buf(buf, len, "dl_cand_list_dropped_high_ul_qos_weight",
 				  htt_stats_buf->dl_cand_list_dropped_high_ul_qos_weight,
-				  ATH12K_HTT_NUM_AC_WMM, "\n");
+				  "\n");
 	len += print_array_to_buf(buf, len, "ax_dlofdma_disabled_due_to_pipelining",
 				  htt_stats_buf->ax_dlofdma_disabled_due_to_pipelining,
-				  ATH12K_HTT_NUM_AC_WMM, "\n");
+				  "\n");
 	len += print_array_to_buf(buf, len, "dlofdma_disabled_su_only_eligible",
 				  htt_stats_buf->dlofdma_disabled_su_only_eligible,
-				  ATH12K_HTT_NUM_AC_WMM, "\n");
+				  "\n");
 	len += print_array_to_buf(buf, len, "dlofdma_disabled_consec_no_mpdus_tried",
 				  htt_stats_buf->dlofdma_disabled_consec_no_mpdus_tried,
-				  ATH12K_HTT_NUM_AC_WMM, "\n");
+				  "\n");
 	len += print_array_to_buf(buf, len, "dlofdma_disabled_consec_no_mpdus_success",
 				  htt_stats_buf->dlofdma_disabled_consec_no_mpdus_success,
-				  ATH12K_HTT_NUM_AC_WMM, "\n\n");
+				  "\n\n");
 
 	stats_req->buf_len = len;
 }
@@ -2676,10 +2637,10 @@ ath12k_htt_print_tx_pdev_rate_stats_be_ofdma_tlv(const void *tag_buf, u16 tag_le
 			 le32_to_cpu(htt_stats_buf->be_ofdma_tx_ldpc));
 	len += print_array_to_buf(buf, len, "be_ofdma_tx_mcs",
 				  htt_stats_buf->be_ofdma_tx_mcs,
-				  ATH12K_HTT_TX_PDEV_NUM_BE_MCS_CNTRS, "\n");
+				  "\n");
 	len += print_array_to_buf(buf, len, "be_ofdma_eht_sig_mcs",
 				  htt_stats_buf->be_ofdma_eht_sig_mcs,
-				  ATH12K_HTT_TX_PDEV_NUM_EHT_SIG_MCS_CNTRS, "\n");
+				  "\n");
 	len += scnprintf(buf + len, buf_len - len, "be_ofdma_tx_ru_size = ");
 	for (i = 0; i < ATH12K_HTT_TX_RX_PDEV_NUM_BE_RU_SIZE_CNTRS; i++)
 		len += scnprintf(buf + len, buf_len - len, " %s:%u ",
@@ -2688,15 +2649,14 @@ ath12k_htt_print_tx_pdev_rate_stats_be_ofdma_tlv(const void *tag_buf, u16 tag_le
 	len += scnprintf(buf + len, buf_len - len, "\n");
 	len += print_array_to_buf_index(buf, len, "be_ofdma_tx_nss = ", 1,
 					htt_stats_buf->be_ofdma_tx_nss,
-					ATH12K_HTT_TX_PDEV_STATS_NUM_SPATIAL_STREAMS,
 					"\n");
 	len += print_array_to_buf(buf, len, "be_ofdma_tx_bw",
 				  htt_stats_buf->be_ofdma_tx_bw,
-				  ATH12K_HTT_TX_PDEV_NUM_BE_BW_CNTRS, "\n");
+				  "\n");
 	for (i = 0; i < ATH12K_HTT_TX_PDEV_NUM_GI_CNTRS; i++) {
 		len += scnprintf(buf + len, buf_len - len,
 				 "be_ofdma_tx_gi[%u]", i);
-		len += print_array_to_buf(buf, len, "", htt_stats_buf->gi[i],
+		len += _print_array_to_buf(buf, len, "", htt_stats_buf->gi[i],
 					  ATH12K_HTT_TX_PDEV_NUM_BE_MCS_CNTRS, "\n");
 	}
 	len += scnprintf(buf + len, buf_len - len, "\n");
