qcacmn: Remove mac2str in CFR

Use QDF_MAC_ADDR_STR and QDF_MAC_ADDR_ARRAY to replace mac2str.

Change-Id: Ic6382a03a2c4f390e6eaad038aa5a634a9e69153
CRs-Fixed: 2653061

target_if/cfr/src/target_if_cfr_6018.c

@@ -315,13 +315,12 @@ static void dump_metadata(struct csi_cfr_header *header, uint32_t cookie)
 	if (meta->is_mu_ppdu) {
 		for (user_id = 0; user_id < meta->num_mu_users; user_id++) {
 			usermac = meta->peer_addr.mu_peer_addr[user_id];
-			cfr_debug("peermac[%d]: %s\n",
-				  user_id,
-				  mac2str(usermac));
+			cfr_debug("peermac[%d]: " QDF_MAC_ADDR_STR,
+				  user_id, QDF_MAC_ADDR_ARRAY(usermac));
 		}
 	} else {
-		cfr_debug("peermac: %s\n",
-			  mac2str(meta->peer_addr.su_peer_addr));
+		cfr_debug("peermac: " QDF_MAC_ADDR_STR,
+			  QDF_MAC_ADDR_ARRAY(meta->peer_addr.su_peer_addr));
 	}
 
 	for (chain_id = 0; chain_id < HOST_MAX_CHAINS; chain_id++) {
@@ -998,10 +997,10 @@ target_if_unregister_to_dbr_enh(struct wlan_objmgr_pdev *pdev)
 static void dump_cfr_peer_tx_event_enh(wmi_cfr_peer_tx_event_param *event,
 				       uint32_t cookie)
 {
-	cfr_debug("<TXCOMP><%u>CFR capture method: %d vdev_id: %d mac: %s\n",
-		  cookie,
+	cfr_debug("<TXCOMP><%u>CFR capture method: %d vdev_id: %d mac: "
+		  QDF_MAC_ADDR_STR, cookie,
 		  event->capture_method, event->vdev_id,
-		  mac2str(&event->peer_mac_addr.bytes[0]));
+		  QDF_MAC_ADDR_ARRAY(event->peer_mac_addr.bytes));
 
 	cfr_debug("<TXCOMP><%u>Chan: %d bw: %d phymode: %d cfreq1: %d cfrq2: %d "
 		  "nss: %d\n",
@@ -1146,8 +1145,9 @@ target_if_peer_capture_event(ol_scn_t sc, uint8_t *data, uint32_t datalen)
 	}
 
 	if ((tx_evt_param.status & PEER_CFR_CAPTURE_EVT_PS_STATUS_MASK) == 1) {
-		cfr_err("CFR capture failed as peer is in powersave : %s",
-			  mac2str(&tx_evt_param.peer_mac_addr.bytes[0]));
+		cfr_err("CFR capture failed as peer is in powersave: "
+			QDF_MAC_ADDR_STR,
+			QDF_MAC_ADDR_ARRAY(tx_evt_param.peer_mac_addr.bytes));
 
 		enh_prepare_cfr_header_txstatus(&tx_evt_param, &header_error);
 		if (cfr_rx_ops->cfr_info_send)
@@ -1162,16 +1162,17 @@ target_if_peer_capture_event(ol_scn_t sc, uint8_t *data, uint32_t datalen)
 	}
 
 	if ((tx_evt_param.status & PEER_CFR_CAPTURE_EVT_STATUS_MASK) == 0) {
-		cfr_debug("CFR capture failed for peer : %s",
-			  mac2str(&tx_evt_param.peer_mac_addr.bytes[0]));
+		cfr_debug("CFR capture failed for peer: " QDF_MAC_ADDR_STR,
+			  QDF_MAC_ADDR_ARRAY(tx_evt_param.peer_mac_addr.bytes));
 		retval = -EINVAL;
 		goto relref;
 	}
 
 	if (tx_evt_param.status & CFR_TX_EVT_STATUS_MASK) {
-		cfr_debug("TX packet returned status %d for peer: %s",
+		cfr_debug("TX packet returned status %d for peer: "
+			  QDF_MAC_ADDR_STR,
 			  tx_evt_param.status & CFR_TX_EVT_STATUS_MASK,
-			  mac2str(&tx_evt_param.peer_mac_addr.bytes[0]));
+			  QDF_MAC_ADDR_ARRAY(tx_evt_param.peer_mac_addr.bytes));
 		retval = -EINVAL;
 		goto relref;
 	}

umac/cfr/dispatcher/inc/wlan_cfr_utils_api.h

@@ -585,22 +585,4 @@ uint8_t count_set_bits(uint32_t value);
  */
 void wlan_cfr_rx_tlv_process(struct wlan_objmgr_pdev *pdev, void *nbuf);
 #endif
-
-/**
- * mac2str() - convert mac address array to string
- *
- * @mac: pointer to mac array
- *
- * Return: string
- */
-static inline const char *
-mac2str(const uint8_t mac[6])
-{
-	static char str[32];
-
-	qdf_snprintf(str, sizeof(str), QDF_MAC_ADDR_STR,
-		     QDF_MAC_ADDR_ARRAY(mac));
-
-	return str;
-}
 #endif

umac/cfr/dispatcher/src/wlan_cfr_ucfg_api.c

@@ -732,14 +732,14 @@ QDF_STATUS ucfg_cfr_get_cfg(struct wlan_objmgr_vdev *vdev)
 			glbl_cfg->ctrl_subtype_filter);
 		cfr_err("Data subtype : 0x%x\n",
 			glbl_cfg->data_subtype_filter);
-		cfr_err("TX Addr : %s\n",
-			mac2str(glbl_cfg->tx_addr));
-		cfr_err("TX Addr Mask : %s\n",
-			mac2str(glbl_cfg->tx_addr_mask));
-		cfr_err("RX Addr : %s\n",
-			mac2str(glbl_cfg->rx_addr));
-		cfr_err("RX Addr Mask: %s\n",
-			mac2str(glbl_cfg->rx_addr_mask));
+		cfr_err("TX Addr: " QDF_MAC_ADDR_STR,
+			QDF_MAC_ADDR_ARRAY(glbl_cfg->tx_addr));
+		cfr_err("TX Addr Mask: " QDF_MAC_ADDR_STR,
+			QDF_MAC_ADDR_ARRAY(glbl_cfg->tx_addr_mask));
+		cfr_err("RX Addr: " QDF_MAC_ADDR_STR,
+			QDF_MAC_ADDR_ARRAY(glbl_cfg->rx_addr));
+		cfr_err("RX Addr Mask: " QDF_MAC_ADDR_STR,
+			QDF_MAC_ADDR_ARRAY(glbl_cfg->rx_addr_mask));
 	}
 
 	wlan_objmgr_pdev_release_ref(pdev, WLAN_CFR_ID);