qcacld-3.0: Clean up logs in STATS path

Clean up logs in STATS request and response path.

Change-Id: I417100c021ef8b776e7bd800ab2df8eebe95d472
CRs-Fixed: 2618311

core/hdd/src/wlan_hdd_stats.c

@@ -3918,7 +3918,7 @@ static int wlan_hdd_get_station_remote(struct wiphy *wiphy,
 	if (status != 0)
 		return status;
 
-	hdd_debug("get peer %pM info", mac);
+	hdd_debug("Peer %pM", mac);
 
 	stainfo = hdd_get_sta_info_by_mac(&adapter->sta_info_list, mac);
 	if (!stainfo) {
@@ -4582,18 +4582,16 @@ static int wlan_hdd_get_sta_stats(struct wiphy *wiphy,
 			rx_mcs_index = 0;
 	}
 
-	hdd_debug("RSSI %d, RLMS %u, rssi high %d, rssi mid %d, rssi low %d",
+	hdd_debug("[RSSI %d, RLMS %u, rssi high %d, rssi mid %d, rssi low %d]-"
+		  "[Rate info: TX: %d, RX: %d]-[Rate flags: TX: 0x%x, RX: 0x%x]"
+		  "-[MCS Index: TX: %d, RX: %d]-[NSS: TX: %d, RX: %d]-"
+		  "[dcm: TX: %d, RX: %d]-[guard interval: TX: %d, RX: %d",
 		  sinfo->signal, link_speed_rssi_report,
 		  link_speed_rssi_high, link_speed_rssi_mid,
-		  link_speed_rssi_low);
-	hdd_debug("Rate info: TX: %d, RX: %d", my_tx_rate, my_rx_rate);
-	hdd_debug("Rate flags: TX: 0x%x, RX: 0x%x", (int)tx_rate_flags,
-		  (int)rx_rate_flags);
-	hdd_debug("MCS Index: TX: %d, RX: %d", (int)tx_mcs_index,
-		  (int)rx_mcs_index);
-	hdd_debug("NSS: TX: %d, RX: %d", (int)tx_nss, (int)rx_nss);
-	hdd_debug("dcm: TX: %d, RX: %d", (int)tx_dcm, (int)rx_dcm);
-	hdd_debug("guard interval: TX: %d, RX: %d", (int)tx_gi, (int)rx_gi);
+		  link_speed_rssi_low, my_tx_rate, my_rx_rate,
+		  (int)tx_rate_flags, (int)rx_rate_flags, (int)tx_mcs_index,
+		  (int)rx_mcs_index, (int)tx_nss, (int)rx_nss,
+		  (int)tx_dcm, (int)rx_dcm, (int)tx_gi, (int)rx_gi);
 
 	if (!ucfg_mlme_stats_is_link_speed_report_actual(hdd_ctx->psoc)) {
 		bool tx_rate_calc, rx_rate_calc;
@@ -4664,19 +4662,18 @@ static int wlan_hdd_get_sta_stats(struct wiphy *wiphy,
 			 HDD_INFO_RX_PACKETS;
 
 	if (tx_rate_flags & TX_RATE_LEGACY) {
-		hdd_debug("TX: Reporting legacy rate %d pkt cnt %d",
-			  sinfo->txrate.legacy, sinfo->tx_packets);
-		hdd_debug("RX: Reporting legacy rate %d pkt cnt %d",
+		hdd_debug("[TX: Reporting legacy rate %d pkt cnt %d]-"
+			  "[RX: Reporting legacy rate %d pkt cnt %d]",
+			  sinfo->txrate.legacy, sinfo->tx_packets,
 			  sinfo->rxrate.legacy, sinfo->rx_packets);
 	} else {
-		hdd_debug("TX: Reporting MCS rate %d, flags 0x%x pkt cnt %d, nss %d, bw %d",
+		hdd_debug("[TX: Reporting MCS rate %d, flags 0x%x pkt cnt %d, nss %d, bw %d]-"
+			  "[RX: Reporting MCS rate %d, flags 0x%x pkt cnt %d, nss %d, bw %d]",
 			  sinfo->txrate.mcs, sinfo->txrate.flags,
 			  sinfo->tx_packets, sinfo->txrate.nss,
-			  sinfo->rxrate.bw);
-		hdd_debug("RX: Reporting MCS rate %d, flags 0x%x pkt cnt %d, nss %d, bw %d",
-			  sinfo->rxrate.mcs, sinfo->rxrate.flags,
-			  sinfo->rx_packets, sinfo->rxrate.nss,
-			  sinfo->rxrate.bw);
+			  sinfo->rxrate.bw, sinfo->rxrate.mcs,
+			  sinfo->rxrate.flags, sinfo->rx_packets,
+			  sinfo->rxrate.nss, sinfo->rxrate.bw);
 	}
 
 	hdd_wlan_fill_per_chain_rssi_stats(sinfo, adapter);

core/wma/src/wma_utils.c

@@ -283,13 +283,6 @@ static inline uint16_t wma_mcs_rate_match(uint16_t raw_rate,
 	uint8_t gi_index_max = 2;
 	uint16_t ret_rate = 0;
 
-	WMA_LOGD("%s raw_rate: %u, %u %u %u %u",
-		 __func__, raw_rate, nss1_rate[0],
-		 nss1_rate[1], nss2_rate[0], nss2_rate[1]);
-	if (is_he)
-		WMA_LOGD("%s : is_he %u,  %u, %u",
-			 __func__, is_he, nss1_rate[2], nss2_rate[2]);
-
 	if (is_he)
 		gi_index_max = 3;
 
@@ -315,9 +308,6 @@ static inline uint16_t wma_mcs_rate_match(uint16_t raw_rate,
 			*guard_interval = TXRATE_GI_0_8_US;
 	}
 
-	WMA_LOGD("%s ret_rate: %u, guard interval %u nss %u",
-		 __func__, ret_rate, *guard_interval, *nss);
-
 	return ret_rate;
 }
 
@@ -460,8 +450,8 @@ uint8_t wma_get_mcs_idx(uint16_t raw_rate, enum tx_rate_info rate_flags,
 	uint16_t *nss1_rate;
 	uint16_t *nss2_rate;
 
-	WMA_LOGD("%s enter:  raw_rate:%d rate_flgs: 0x%x, nss: %d",
-		 __func__, raw_rate, rate_flags, *nss);
+	wma_debug("Rates from FW:  raw_rate:%d rate_flgs: 0x%x, nss: %d",
+		  raw_rate, rate_flags, *nss);
 
 	*mcs_rate_flag = rate_flags;
 
@@ -567,7 +557,7 @@ rate_found:
 	else
 		*mcs_rate_flag &= ~TX_RATE_SGI;
 
-	WMA_LOGD("%s exit: match_rate %d index: %d"
+	WMA_LOGD("%s Matched rate in table: %d index: %d"
 		 " mcs_rate_flag: 0x%x nss %d guard interval %d",
 		 __func__, match_rate, index, *mcs_rate_flag,
 		 *nss, *guard_interval);