qcacmn: Replace WMI_LOGP() with wmi_* appropriate log level

Replace WMI_LOGP() with wmi_alert() or with appropriate log level.

CRs-Fixed: 2774563
Change-Id: I53ad75f3b645306551250f7f400f8802692a01a3

wmi/src/wmi_unified_apf_tlv.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2019 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2020 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -16,6 +16,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include <wmi_unified_priv.h>
 #include "wmi_unified_apf_tlv.h"
 #include "wmi.h"
 
@@ -75,7 +76,7 @@ QDF_STATUS wmi_send_apf_enable_cmd_tlv(wmi_unified_t wmi_handle,
 
 	buf = wmi_buf_alloc(wmi_handle, sizeof(*cmd));
 	if (!buf) {
-		WMI_LOGP("%s: wmi_buf_alloc failed", __func__);
+		wmi_err("wmi_buf_alloc failed");
 		return QDF_STATUS_E_NOMEM;
 	}
 
@@ -120,7 +121,7 @@ wmi_send_apf_write_work_memory_cmd_tlv(wmi_unified_t wmi_handle,
 
 	buf = wmi_buf_alloc(wmi_handle, wmi_buf_len);
 	if (!buf) {
-		WMI_LOGP("%s: wmi_buf_alloc failed", __func__);
+		wmi_err("wmi_buf_alloc failed");
 		return QDF_STATUS_E_NOMEM;
 	}
 
@@ -165,7 +166,7 @@ wmi_send_apf_read_work_memory_cmd_tlv(wmi_unified_t wmi_handle,
 
 	buf = wmi_buf_alloc(wmi_handle, sizeof(*cmd));
 	if (!buf) {
-		WMI_LOGP("%s: wmi_buf_alloc failed", __func__);
+		wmi_err("wmi_buf_alloc failed");
 		return QDF_STATUS_E_NOMEM;
 	}
 

wmi/src/wmi_unified_concurrency_tlv.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2019 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013-2020 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -61,8 +61,8 @@ static QDF_STATUS send_set_enable_disable_mcc_adaptive_scheduler_cmd_tlv(
 	ret = wmi_unified_cmd_send(wmi_handle, buf, len,
 				   WMI_RESMGR_ADAPTIVE_OCS_ENABLE_DISABLE_CMDID);
 	if (QDF_IS_STATUS_ERROR(ret)) {
-		WMI_LOGP("%s: Failed to send enable/disable MCC"
-			 " adaptive scheduler command", __func__);
+		wmi_err("Failed to send enable/disable MCC"
+			" adaptive scheduler command");
 		wmi_buf_free(buf);
 	}
 

wmi/src/wmi_unified_extscan_tlv.c

@@ -460,8 +460,7 @@ static QDF_STATUS wmi_get_buf_extscan_change_monitor_cmd
 
 	*buf = wmi_buf_alloc(wmi_handle, len);
 	if (!*buf) {
-		WMI_LOGP("%s: failed to allocate memory for change monitor cmd",
-			 __func__);
+		wmi_err("Failed to allocate memory for change monitor cmd");
 		return QDF_STATUS_E_FAILURE;
 	}
 	buf_ptr = (uint8_t *) wmi_buf_data(*buf);
@@ -721,8 +720,7 @@ QDF_STATUS wmi_get_buf_extscan_start_cmd(wmi_unified_t wmi_handle,
 	/* Allocate the memory */
 	*buf = wmi_buf_alloc(wmi_handle, len);
 	if (!*buf) {
-		WMI_LOGP("%s: failed to allocate memory for start extscan cmd",
-			__func__);
+		wmi_err("Failed to allocate memory for start extscan cmd");
 		return QDF_STATUS_E_NOMEM;
 	}
 	buf_ptr = (uint8_t *) wmi_buf_data(*buf);
@@ -1011,7 +1009,7 @@ static QDF_STATUS send_extscan_start_hotlist_monitor_cmd_tlv
 		len += min_entries * sizeof(wmi_extscan_hotlist_entry);
 		buf = wmi_buf_alloc(wmi_handle, len);
 		if (!buf) {
-			WMI_LOGP("%s: wmi_buf_alloc failed", __func__);
+			wmi_err("wmi_buf_alloc failed");
 			return QDF_STATUS_E_FAILURE;
 		}
 		buf_ptr = (uint8_t *) wmi_buf_data(buf);

wmi/src/wmi_unified_ocb_ut.c

@@ -54,7 +54,7 @@ static QDF_STATUS fake_vdev_create_cmd_tlv(wmi_unified_t wmi_handle,
 				 uint8_t macaddr[QDF_MAC_ADDR_SIZE],
 				 struct vdev_create_params *param)
 {
-	WMI_LOGP("%s : called", __func__);
+	wmi_debug("called");
 	return QDF_STATUS_SUCCESS;
 }
 
@@ -68,7 +68,7 @@ static QDF_STATUS fake_vdev_create_cmd_tlv(wmi_unified_t wmi_handle,
 static QDF_STATUS fake_vdev_delete_cmd_tlv(wmi_unified_t wmi_handle,
 					  uint8_t if_id)
 {
-	WMI_LOGP("%s : called", __func__);
+	wmi_debug("called");
 	return QDF_STATUS_SUCCESS;
 }
 
@@ -82,7 +82,7 @@ static QDF_STATUS fake_vdev_delete_cmd_tlv(wmi_unified_t wmi_handle,
 static QDF_STATUS fake_ocb_set_utc_time_cmd_tlv(wmi_unified_t wmi_handle,
 				struct ocb_utc_param *utc)
 {
-	WMI_LOGP("%s : called", __func__);
+	wmi_debug("called");
 	return QDF_STATUS_SUCCESS;
 }
 
@@ -102,10 +102,10 @@ static QDF_STATUS fake_ocb_get_tsf_timer_cmd_tlv(wmi_unified_t wmi_handle,
 	struct ocb_get_tsf_timer_response response;
 	ol_scn_t scn = (ol_scn_t) wmi_handle->scn_handle;
 
-	WMI_LOGP("%s : called", __func__);
+	wmi_debug("called");
 	psoc = target_if_get_psoc_from_scn_hdl(scn);
 	if (!psoc) {
-		WMI_LOGP("null psoc");
+		wmi_err("null psoc");
 		return -EINVAL;
 	}
 	response.vdev_id = vdev_id;
@@ -116,11 +116,11 @@ static QDF_STATUS fake_ocb_get_tsf_timer_cmd_tlv(wmi_unified_t wmi_handle,
 	if (ocb_rx_ops->ocb_tsf_timer) {
 		status = ocb_rx_ops->ocb_tsf_timer(psoc, &response);
 		if (status != QDF_STATUS_SUCCESS) {
-			WMI_LOGP("ocb_tsf_timer failed.");
+			wmi_err("ocb_tsf_timer failed");
 			return -EINVAL;
 		}
 	} else {
-		WMI_LOGP("No ocb_tsf_timer callback");
+		wmi_err("No ocb_tsf_timer callback");
 		return -EINVAL;
 	}
 	return QDF_STATUS_SUCCESS;
@@ -137,7 +137,7 @@ static QDF_STATUS fake_ocb_get_tsf_timer_cmd_tlv(wmi_unified_t wmi_handle,
 static QDF_STATUS fake_dcc_clear_stats_cmd_tlv(wmi_unified_t wmi_handle,
 				uint32_t vdev_id, uint32_t dcc_stats_bitmap)
 {
-	WMI_LOGP("%s : called", __func__);
+	wmi_debug("called");
 	return QDF_STATUS_SUCCESS;
 }
 
@@ -173,11 +173,11 @@ static QDF_STATUS fake_dcc_get_stats_cmd_tlv(wmi_unified_t wmi_handle,
 	struct wlan_ocb_rx_ops *ocb_rx_ops;
 	ol_scn_t scn = (ol_scn_t) wmi_handle->scn_handle;
 	struct ocb_dcc_get_stats_response *response;
-	WMI_LOGP("%s : called", __func__);
 
+	wmi_debug("called");
 	psoc = target_if_get_psoc_from_scn_hdl(scn);
 	if (!psoc) {
-		WMI_LOGP("null psoc");
+		wmi_err("null psoc");
 		return -EINVAL;
 	}
 	response = qdf_mem_malloc(sizeof(*response) + 2 *
@@ -190,20 +190,20 @@ static QDF_STATUS fake_dcc_get_stats_cmd_tlv(wmi_unified_t wmi_handle,
 	qdf_mem_copy(response->channel_stats_array,
 		     &chan1_info,
 		     2 * sizeof(wmi_dcc_ndl_stats_per_channel));
-	WMI_LOGP("channel1 freq %d, channel2 freq %d", chan1_info[0].chan_info,
-			chan1_info[1].chan_info);
+	wmi_debug("channel1 freq %d, channel2 freq %d", chan1_info[0].chan_info,
+		 chan1_info[1].chan_info);
 	ocb_rx_ops = target_if_ocb_get_rx_ops(psoc);
 	if (ocb_rx_ops->ocb_dcc_stats_indicate) {
 		status = ocb_rx_ops->ocb_dcc_stats_indicate(psoc,
 						response, true);
 		if (status != QDF_STATUS_SUCCESS) {
-			WMI_LOGP("dcc_stats_indicate failed.");
+			wmi_err("dcc_stats_indicate failed");
 			status = -EINVAL;
 		} else {
 			status = 0;
 		}
 	} else {
-		WMI_LOGP("No dcc_stats_indicate callback");
+		wmi_err("No dcc_stats_indicate callback");
 		status = -EINVAL;
 	}
 
@@ -226,7 +226,8 @@ static QDF_STATUS fake_dcc_update_ndl_cmd_tlv(wmi_unified_t wmi_handle,
 	struct wlan_ocb_rx_ops *ocb_rx_ops;
 	ol_scn_t scn = (ol_scn_t) wmi_handle->scn_handle;
 	struct ocb_dcc_update_ndl_response *resp;
-	WMI_LOGP("%s : called", __func__);
+
+	wmi_debug("called");
 	/* Allocate and populate the response */
 	resp = qdf_mem_malloc(sizeof(*resp));
 	if (!resp)
@@ -237,7 +238,7 @@ static QDF_STATUS fake_dcc_update_ndl_cmd_tlv(wmi_unified_t wmi_handle,
 
 	psoc = target_if_get_psoc_from_scn_hdl(scn);
 	if (!psoc) {
-		WMI_LOGP("null psoc");
+		wmi_err("null psoc");
 		return -EINVAL;
 	}
 
@@ -245,13 +246,13 @@ static QDF_STATUS fake_dcc_update_ndl_cmd_tlv(wmi_unified_t wmi_handle,
 	if (ocb_rx_ops->ocb_dcc_ndl_update) {
 		status = ocb_rx_ops->ocb_dcc_ndl_update(psoc, resp);
 		if (status != QDF_STATUS_SUCCESS) {
-			WMI_LOGP("dcc_ndl_update failed.");
+			wmi_err("dcc_ndl_update failed");
 			status = -EINVAL;
 		} else {
 			status = 0;
 		}
 	} else {
-		WMI_LOGP("No dcc_ndl_update callback");
+		wmi_err("No dcc_ndl_update callback");
 		status = -EINVAL;
 	}
 
@@ -275,7 +276,7 @@ static QDF_STATUS fake_ocb_set_config_cmd_tlv(wmi_unified_t wmi_handle,
 	struct wlan_ocb_rx_ops *ocb_rx_ops;
 	ol_scn_t scn = (ol_scn_t) wmi_handle->scn_handle;
 
-	WMI_LOGP("%s : called", __func__);
+	wmi_debug("called");
 	WMI_LOGI("%s: vdev_id=%d, channel_count=%d, schedule_size=%d, flag=%x",
 		 __func__, config->vdev_id, config->channel_count,
 		 config->schedule_size, config->flags);
@@ -304,7 +305,7 @@ static QDF_STATUS fake_ocb_set_config_cmd_tlv(wmi_unified_t wmi_handle,
 	}
 	psoc = target_if_get_psoc_from_scn_hdl(scn);
 	if (!psoc) {
-		WMI_LOGP("null psoc");
+		wmi_err("null psoc");
 		return -EINVAL;
 	}
 
@@ -312,11 +313,11 @@ static QDF_STATUS fake_ocb_set_config_cmd_tlv(wmi_unified_t wmi_handle,
 	if (ocb_rx_ops->ocb_set_config_status) {
 		status = ocb_rx_ops->ocb_set_config_status(psoc, 0);
 		if (status != QDF_STATUS_SUCCESS) {
-			WMI_LOGP("ocb_set_config_status failed.");
+			wmi_err("ocb_set_config_status failed");
 			return -EINVAL;
 		}
 	} else {
-		WMI_LOGP("No ocb_set_config_status callback");
+		wmi_err("No ocb_set_config_status callback");
 		return -EINVAL;
 	}
 	return QDF_STATUS_SUCCESS;
@@ -333,7 +334,7 @@ static QDF_STATUS fake_ocb_set_config_cmd_tlv(wmi_unified_t wmi_handle,
 static QDF_STATUS fake_ocb_stop_timing_advert_cmd_tlv(wmi_unified_t wmi_handle,
 	struct ocb_timing_advert_param *timing_advert)
 {
-	WMI_LOGP("%s : called", __func__);
+	wmi_debug("called");
 	return QDF_STATUS_SUCCESS;
 }
 
@@ -349,7 +350,7 @@ static QDF_STATUS
 fake_ocb_start_timing_advert_cmd_tlv(wmi_unified_t wmi_handle,
 		struct ocb_timing_advert_param *timing_advert)
 {
-	WMI_LOGP("%s : called", __func__);
+	wmi_debug("called");
 	return QDF_STATUS_SUCCESS;
 }
 
@@ -365,7 +366,7 @@ fake_ocb_start_timing_advert_cmd_tlv(wmi_unified_t wmi_handle,
 static QDF_STATUS fake_peer_create_cmd_tlv(wmi_unified_t wmi,
 					struct peer_create_params *param)
 {
-	WMI_LOGP("%s : called", __func__);
+	wmi_debug("called");
 	return QDF_STATUS_SUCCESS;
 }
 
@@ -381,7 +382,7 @@ static QDF_STATUS fake_peer_delete_cmd_tlv(wmi_unified_t wmi,
 				 uint8_t peer_addr[QDF_MAC_ADDR_SIZE],
 				 uint8_t vdev_id)
 {
-	WMI_LOGP("%s : called", __func__);
+	wmi_debug("called");
 	return QDF_STATUS_SUCCESS;
 }
 
@@ -396,7 +397,7 @@ static QDF_STATUS fake_vdev_start_cmd_tlv(wmi_unified_t wmi_handle,
 			  struct vdev_start_params *req)
 {
 	tp_wma_handle wma = (tp_wma_handle) wmi_handle->scn_handle;
-	WMI_LOGP("%s : called", __func__);
+	wmi_debug("called");
 	WMI_LOGI("%s: vdev_id %d freq %d chanmode %d ch_info is_dfs %d "
 		"beacon interval %d dtim %d center_chan %d center_freq2 %d "
 		"max_txpow: 0x%x "
@@ -422,7 +423,7 @@ static QDF_STATUS fake_vdev_start_cmd_tlv(wmi_unified_t wmi_handle,
  */
 static QDF_STATUS fake_vdev_down_cmd_tlv(wmi_unified_t wmi, uint8_t vdev_id)
 {
-	WMI_LOGP("%s : called", __func__);
+	wmi_debug("called");
 	return QDF_STATUS_SUCCESS;
 }
 
@@ -437,7 +438,7 @@ static QDF_STATUS fake_vdev_down_cmd_tlv(wmi_unified_t wmi, uint8_t vdev_id)
 static QDF_STATUS fake_vdev_set_param_cmd_tlv(wmi_unified_t wmi_handle,
 				struct vdev_set_params *param)
 {
-	WMI_LOGP("%s : called", __func__);
+	wmi_debug("called");
 	return QDF_STATUS_SUCCESS;
 }
 
@@ -455,7 +456,7 @@ static QDF_STATUS fake_set_enable_disable_mcc_adaptive_scheduler_cmd_tlv(
 		wmi_unified_t wmi_handle, uint32_t mcc_adaptive_scheduler,
 		uint32_t pdev_id)
 {
-	WMI_LOGP("%s : called", __func__);
+	wmi_debug("called");
 	return QDF_STATUS_SUCCESS;
 }
 
@@ -472,7 +473,7 @@ static QDF_STATUS fake_set_enable_disable_mcc_adaptive_scheduler_cmd_tlv(
 static QDF_STATUS fake_process_set_ie_info_cmd_tlv(wmi_unified_t wmi_handle,
 				   struct vdev_ie_info_param *ie_info)
 {
-	WMI_LOGP("%s : called", __func__);
+	wmi_debug("called");
 	return QDF_STATUS_SUCCESS;
 }
 
@@ -481,7 +482,7 @@ void wmi_ocb_ut_attach(struct wmi_unified *wmi_handle)
 	struct wmi_ops *wmi_ops;
 
 	if (!wmi_handle) {
-		WMI_LOGP("%s: null wmi handle", __func__);
+		wmi_err("null wmi handle");
 		return;
 	}
 

wmi/src/wmi_unified_sta_tlv.c

@@ -454,8 +454,7 @@ static QDF_STATUS send_nat_keepalive_en_cmd_tlv(wmi_unified_t wmi_handle, uint8_
 	wmi_mtrace(WMI_VDEV_IPSEC_NATKEEPALIVE_FILTER_CMDID, cmd->vdev_id, 0);
 	if (wmi_unified_cmd_send(wmi_handle, buf, len,
 				 WMI_VDEV_IPSEC_NATKEEPALIVE_FILTER_CMDID)) {
-		WMI_LOGP("%s: Failed to send NAT keepalive enable command",
-			 __func__);
+		wmi_err("Failed to send NAT keepalive enable command");
 		wmi_buf_free(buf);
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -619,7 +618,7 @@ static QDF_STATUS send_set_tdls_offchan_mode_cmd_tlv(wmi_unified_t wmi_handle,
 	wmi_mtrace(WMI_TDLS_SET_OFFCHAN_MODE_CMDID, cmd->vdev_id, 0);
 	if (wmi_unified_cmd_send(wmi_handle, wmi_buf, len,
 		WMI_TDLS_SET_OFFCHAN_MODE_CMDID)) {
-		WMI_LOGP(FL("failed to send tdls off chan command"));
+		wmi_err("failed to send tdls off chan command");
 		wmi_buf_free(wmi_buf);
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -710,7 +709,7 @@ send_update_fw_tdls_state_cmd_tlv(wmi_unified_t wmi_handle,
 	wmi_mtrace(WMI_TDLS_SET_STATE_CMDID, cmd->vdev_id, 0);
 	if (wmi_unified_cmd_send(wmi_handle, wmi_buf, len,
 				 WMI_TDLS_SET_STATE_CMDID)) {
-		WMI_LOGP("%s: failed to send tdls set state command", __func__);
+		wmi_err("Failed to send tdls set state command");
 		wmi_buf_free(wmi_buf);
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -1583,7 +1582,7 @@ static QDF_STATUS send_del_ts_cmd_tlv(wmi_unified_t wmi_handle, uint8_t vdev_id,
 	wmi_mtrace(WMI_VDEV_WMM_DELTS_CMDID, cmd->vdev_id, 0);
 	if (wmi_unified_cmd_send(wmi_handle, buf, len,
 				 WMI_VDEV_WMM_DELTS_CMDID)) {
-		WMI_LOGP("%s: Failed to send vdev DELTS command", __func__);
+		wmi_err("Failed to send vdev DELTS command");
 		wmi_buf_free(buf);
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -1644,8 +1643,7 @@ static QDF_STATUS send_aggr_qos_cmd_tlv(wmi_unified_t wmi_handle,
 			wmi_mtrace(WMI_VDEV_WMM_ADDTS_CMDID, cmd->vdev_id, 0);
 			if (wmi_unified_cmd_send(wmi_handle, buf, len,
 						 WMI_VDEV_WMM_ADDTS_CMDID)) {
-				WMI_LOGP("%s: Failed to send vdev ADDTS command",
-					 __func__);
+				wmi_err("Failed to send vdev ADDTS command");
 				aggr_qos_rsp_msg->status[i] =
 							QDF_STATUS_E_FAILURE;
 				wmi_buf_free(buf);
@@ -1692,7 +1690,7 @@ static QDF_STATUS send_add_ts_cmd_tlv(wmi_unified_t wmi_handle,
 	wmi_mtrace(WMI_VDEV_WMM_ADDTS_CMDID, cmd->vdev_id, 0);
 	if (wmi_unified_cmd_send(wmi_handle, buf, len,
 				 WMI_VDEV_WMM_ADDTS_CMDID)) {
-		WMI_LOGP("%s: Failed to send vdev ADDTS command", __func__);
+		wmi_err("Failed to send vdev ADDTS command");
 		msg->status = QDF_STATUS_E_FAILURE;
 		wmi_buf_free(buf);
 		return QDF_STATUS_E_FAILURE;
@@ -2373,7 +2371,7 @@ static QDF_STATUS send_peer_unmap_conf_cmd_tlv(wmi_unified_t wmi,
 	buf = wmi_buf_alloc(wmi, len);
 
 	if (!buf) {
-		WMI_LOGP("%s: wmi_buf_alloc failed", __func__);
+		wmi_err("wmi_buf_alloc failed");
 		return QDF_STATUS_E_NOMEM;
 	}
 

wmi/src/wmi_unified_tlv.c

@@ -916,7 +916,7 @@ static QDF_STATUS send_vdev_stop_cmd_tlv(wmi_unified_t wmi,
 	cmd->vdev_id = vdev_id;
 	wmi_mtrace(WMI_VDEV_STOP_CMDID, cmd->vdev_id, 0);
 	if (wmi_unified_cmd_send(wmi, buf, len, WMI_VDEV_STOP_CMDID)) {
-		WMI_LOGP("%s: Failed to send vdev stop command", __func__);
+		wmi_err("Failed to send vdev stop command");
 		wmi_buf_free(buf);
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -949,7 +949,7 @@ static QDF_STATUS send_vdev_down_cmd_tlv(wmi_unified_t wmi, uint8_t vdev_id)
 	cmd->vdev_id = vdev_id;
 	wmi_mtrace(WMI_VDEV_DOWN_CMDID, cmd->vdev_id, 0);
 	if (wmi_unified_cmd_send(wmi, buf, len, WMI_VDEV_DOWN_CMDID)) {
-		WMI_LOGP("%s: Failed to send vdev down", __func__);
+		wmi_err("Failed to send vdev down");
 		wmi_buf_free(buf);
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -1095,7 +1095,7 @@ static QDF_STATUS send_vdev_start_cmd_tlv(wmi_unified_t wmi_handle,
 					   WMI_VDEV_START_REQUEST_CMDID);
 	}
 	if (ret) {
-		WMI_LOGP("%s: Failed to send vdev start command", __func__);
+		wmi_err("Failed to send vdev start command");
 		wmi_buf_free(buf);
 		return QDF_STATUS_E_FAILURE;
 	 }
@@ -1136,7 +1136,7 @@ static QDF_STATUS send_peer_flush_tids_cmd_tlv(wmi_unified_t wmi,
 		 param->peer_tid_bitmap);
 	wmi_mtrace(WMI_PEER_FLUSH_TIDS_CMDID, cmd->vdev_id, 0);
 	if (wmi_unified_cmd_send(wmi, buf, len, WMI_PEER_FLUSH_TIDS_CMDID)) {
-		WMI_LOGP("%s: Failed to send flush tid command", __func__);
+		wmi_err("Failed to send flush tid command");
 		wmi_buf_free(buf);
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -1175,7 +1175,7 @@ static QDF_STATUS send_peer_delete_cmd_tlv(wmi_unified_t wmi,
 		 __func__, QDF_MAC_ADDR_REF(peer_addr), vdev_id);
 	wmi_mtrace(WMI_PEER_DELETE_CMDID, cmd->vdev_id, 0);
 	if (wmi_unified_cmd_send(wmi, buf, len, WMI_PEER_DELETE_CMDID)) {
-		WMI_LOGP("%s: Failed to send peer delete command", __func__);
+		wmi_err("Failed to send peer delete command");
 		wmi_buf_free(buf);
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -1214,7 +1214,7 @@ static QDF_STATUS send_peer_delete_all_cmd_tlv(
 	wmi_mtrace(WMI_VDEV_DELETE_ALL_PEER_CMDID, cmd->vdev_id, 0);
 	if (wmi_unified_cmd_send(wmi, buf, len,
 				 WMI_VDEV_DELETE_ALL_PEER_CMDID)) {
-		WMI_LOGP("%s: Failed to send peer del all command", __func__);
+		wmi_err("Failed to send peer del all command");
 		wmi_buf_free(buf);
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -1336,7 +1336,7 @@ static QDF_STATUS send_vdev_up_cmd_tlv(wmi_unified_t wmi,
 	WMI_CHAR_ARRAY_TO_MAC_ADDR(bssid, &cmd->vdev_bssid);
 	wmi_mtrace(WMI_VDEV_UP_CMDID, cmd->vdev_id, 0);
 	if (wmi_unified_cmd_send(wmi, buf, len, WMI_VDEV_UP_CMDID)) {
-		WMI_LOGP("%s: Failed to send vdev up command", __func__);
+		wmi_err("Failed to send vdev up command");
 		wmi_buf_free(buf);
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -1375,7 +1375,7 @@ static QDF_STATUS send_peer_create_cmd_tlv(wmi_unified_t wmi,
 
 	wmi_mtrace(WMI_PEER_CREATE_CMDID, cmd->vdev_id, 0);
 	if (wmi_unified_cmd_send(wmi, buf, len, WMI_PEER_CREATE_CMDID)) {
-		WMI_LOGP("%s: failed to send WMI_PEER_CREATE_CMDID", __func__);
+		wmi_err("Failed to send WMI_PEER_CREATE_CMDID");
 		wmi_buf_free(buf);
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -1424,8 +1424,7 @@ QDF_STATUS send_peer_rx_reorder_queue_setup_cmd_tlv(wmi_unified_t wmi,
 	wmi_mtrace(WMI_PEER_REORDER_QUEUE_SETUP_CMDID, cmd->vdev_id, 0);
 	if (wmi_unified_cmd_send(wmi, buf, len,
 			WMI_PEER_REORDER_QUEUE_SETUP_CMDID)) {
-		WMI_LOGP("%s: fail to send WMI_PEER_REORDER_QUEUE_SETUP_CMDID",
-			__func__);
+		wmi_err("Fail to send WMI_PEER_REORDER_QUEUE_SETUP_CMDID");
 		wmi_buf_free(buf);
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -1470,8 +1469,7 @@ QDF_STATUS send_peer_rx_reorder_queue_remove_cmd_tlv(wmi_unified_t wmi,
 	wmi_mtrace(WMI_PEER_REORDER_QUEUE_REMOVE_CMDID, cmd->vdev_id, 0);
 	if (wmi_unified_cmd_send(wmi, buf, len,
 			WMI_PEER_REORDER_QUEUE_REMOVE_CMDID)) {
-		WMI_LOGP("%s: fail to send WMI_PEER_REORDER_QUEUE_REMOVE_CMDID",
-			__func__);
+		wmi_err("Fail to send WMI_PEER_REORDER_QUEUE_REMOVE_CMDID");
 		wmi_buf_free(buf);
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -2700,8 +2698,7 @@ static QDF_STATUS send_peer_assoc_cmd_tlv(wmi_unified_t wmi_handle,
 	ret = wmi_unified_cmd_send(wmi_handle, buf, len,
 				   WMI_PEER_ASSOC_CMDID);
 	if (QDF_IS_STATUS_ERROR(ret)) {
-		WMI_LOGP("%s: Failed to send peer assoc command ret = %d",
-			 __func__, ret);
+		wmi_err("Failed to send peer assoc command ret = %d", ret);
 		wmi_buf_free(buf);
 	}
 
@@ -5460,8 +5457,7 @@ static QDF_STATUS send_csa_offload_enable_cmd_tlv(wmi_unified_t wmi_handle,
 	wmi_mtrace(WMI_CSA_OFFLOAD_ENABLE_CMDID, cmd->vdev_id, 0);
 	if (wmi_unified_cmd_send(wmi_handle, buf, len,
 				 WMI_CSA_OFFLOAD_ENABLE_CMDID)) {
-		WMI_LOGP("%s: Failed to send CSA offload enable command",
-			 __func__);
+		wmi_err("Failed to send CSA offload enable command");
 		wmi_buf_free(buf);
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -6111,8 +6107,7 @@ static QDF_STATUS send_regdomain_info_to_fw_cmd_tlv(wmi_unified_t wmi_handle,
 	wmi_mtrace(WMI_PDEV_SET_REGDOMAIN_CMDID, NO_SESSION, 0);
 	if (wmi_unified_cmd_send(wmi_handle, buf, len,
 				 WMI_PDEV_SET_REGDOMAIN_CMDID)) {
-		WMI_LOGP("%s: Failed to send pdev set regdomain command",
-			 __func__);
+		wmi_err("Failed to send pdev set regdomain command");
 		wmi_buf_free(buf);
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -6510,7 +6505,7 @@ static QDF_STATUS send_simulation_test_cmd_tlv(wmi_unified_t wmi_handle,
 
 	buf = wmi_buf_alloc(wmi_handle, wmi_buf_len);
 	if (!buf) {
-		WMI_LOGP("%s: wmi_buf_alloc failed", __func__);
+		wmi_err("wmi_buf_alloc failed");
 		return QDF_STATUS_E_NOMEM;
 	}
 
@@ -8117,7 +8112,7 @@ QDF_STATUS send_fw_test_cmd_tlv(wmi_unified_t wmi_handle,
 	wmi_mtrace(WMI_FWTEST_CMDID, NO_SESSION, 0);
 	if (wmi_unified_cmd_send(wmi_handle, wmi_buf, len,
 				 WMI_FWTEST_CMDID)) {
-		WMI_LOGP("%s: failed to send fw test command", __func__);
+		wmi_err("Failed to send fw test command");
 		wmi_buf_free(wmi_buf);
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -8176,7 +8171,7 @@ static QDF_STATUS send_unit_test_cmd_tlv(wmi_unified_t wmi_handle,
 	wmi_mtrace(WMI_UNIT_TEST_CMDID, cmd->vdev_id, 0);
 	if (wmi_unified_cmd_send(wmi_handle, wmi_buf, len,
 				 WMI_UNIT_TEST_CMDID)) {
-		WMI_LOGP("%s: failed to send unit test command", __func__);
+		wmi_err("Failed to send unit test command");
 		wmi_buf_free(wmi_buf);
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -13660,7 +13655,7 @@ static QDF_STATUS send_wlan_ts_ftm_trigger_cmd_tlv(wmi_unified_t wmi,
 
 	buf = wmi_buf_alloc(wmi, len);
 	if (!buf) {
-		WMI_LOGP("%s: wmi_buf_alloc failed", __func__);
+		wmi_err("wmi_buf_alloc failed");
 		return QDF_STATUS_E_NOMEM;
 	}
 	cmd = (wmi_audio_sync_trigger_cmd_fixed_param *)wmi_buf_data(buf);
@@ -13688,7 +13683,7 @@ static QDF_STATUS send_wlan_ts_qtime_cmd_tlv(wmi_unified_t wmi,
 
 	buf = wmi_buf_alloc(wmi, len);
 	if (!buf) {
-		WMI_LOGP("%s: wmi_buf_alloc failed", __func__);
+		wmi_err("wmi_buf_alloc failed");
 		return QDF_STATUS_E_NOMEM;
 	}
 	cmd = (wmi_audio_sync_qtimer_cmd_fixed_param *)wmi_buf_data(buf);
@@ -13700,7 +13695,7 @@ static QDF_STATUS send_wlan_ts_qtime_cmd_tlv(wmi_unified_t wmi,
 	cmd->qtimer_l32 = (uint32_t)(lpass_ts & 0xffffffffLL);
 
 	if (wmi_unified_cmd_send(wmi, buf, len, WMI_VDEV_AUDIO_SYNC_QTIMER_CMDID)) {
-		WMI_LOGP("%s: Failed to send audio qtime command", __func__);
+		wmi_err("Failed to send audio qtime command");
 		wmi_buf_free(buf);
 		return QDF_STATUS_E_FAILURE;
 	}

wmi/src/wmi_unified_vdev_tlv.c

@@ -389,7 +389,7 @@ void wmi_vdev_attach_tlv(struct wmi_unified *wmi_handle)
 	struct wmi_ops *wmi_ops;
 
 	if (!wmi_handle) {
-		WMI_LOGP("%s: null wmi handle", __func__);
+		wmi_err("null wmi handle");
 		return;
 	}