qcacld-3.0: Fix embedded function name checkpatch warnings

Logging macros already print function name by default,
there is no need to print the function name again as part of the log.

Hence, remove the function name or
wherever required use '"%s...", __func__'

Change-Id: Ib6dc6cc03ef148146b1c626271d5ac3b7345c4bb
CRs-Fixed: 2312593

core/bmi/src/bmi_1.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2017 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2014-2018 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
@@ -285,7 +285,7 @@ QDF_STATUS bmi_done_local(struct ol_context *ol_ctx)
 
 	info = GET_BMI_CONTEXT(ol_ctx);
 	if (info->bmi_done) {
-		BMI_DBG("bmi_done_local skipped");
+		BMI_DBG(FL("skipped"));
 		return QDF_STATUS_E_PERM;
 	}
 

core/dp/txrx/ol_rx_defrag.c

@@ -672,7 +672,7 @@ ol_rx_defrag(ol_txrx_pdev_handle pdev,
 				ol_rx_frames_free(htt_pdev, frag_list);
 			}
 			ol_rx_frames_free(htt_pdev, tmp_next);
-			ol_txrx_err("ol_rx_defrag: PN Check failed\n");
+			ol_txrx_err("PN Check failed");
 			return;
 		}
 		/* remove FCS from each fragment */
@@ -699,7 +699,7 @@ ol_rx_defrag(ol_txrx_pdev_handle pdev,
 			if (!ol_rx_frag_tkip_decap(pdev, cur, hdr_space)) {
 				/* TKIP decap failed, discard frags */
 				ol_rx_frames_free(htt_pdev, frag_list);
-				ol_txrx_err("\n ol_rx_defrag: TKIP decap failed\n");
+				ol_txrx_err("TKIP decap failed");
 				return;
 			}
 			cur = tmp_next;
@@ -712,13 +712,13 @@ ol_rx_defrag(ol_txrx_pdev_handle pdev,
 			if (!ol_rx_frag_ccmp_demic(pdev, cur, hdr_space)) {
 				/* CCMP demic failed, discard frags */
 				ol_rx_frames_free(htt_pdev, frag_list);
-				ol_txrx_err("\n ol_rx_defrag: CCMP demic failed\n");
+				ol_txrx_err("CCMP demic failed");
 				return;
 			}
 			if (!ol_rx_frag_ccmp_decap(pdev, cur, hdr_space)) {
 				/* CCMP decap failed, discard frags */
 				ol_rx_frames_free(htt_pdev, frag_list);
-				ol_txrx_err("\n ol_rx_defrag: CCMP decap failed\n");
+				ol_txrx_err("CCMP decap failed");
 				return;
 			}
 			cur = tmp_next;
@@ -733,7 +733,7 @@ ol_rx_defrag(ol_txrx_pdev_handle pdev,
 			if (!ol_rx_frag_wep_decap(pdev, cur, hdr_space)) {
 				/* wep decap failed, discard frags */
 				ol_rx_frames_free(htt_pdev, frag_list);
-				ol_txrx_err("\n ol_rx_defrag: wep decap failed\n");
+				ol_txrx_err("wep decap failed");
 				return;
 			}
 			cur = tmp_next;
@@ -757,7 +757,7 @@ ol_rx_defrag(ol_txrx_pdev_handle pdev,
 			ol_rx_err(pdev->ctrl_pdev,
 				  vdev->vdev_id, peer->mac_addr.raw, tid, 0,
 				  OL_RX_DEFRAG_ERR, msdu, NULL, 0);
-			ol_txrx_err("\n ol_rx_defrag: TKIP demic failed\n");
+			ol_txrx_err("TKIP demic failed");
 			return;
 		}
 	}

core/dp/txrx/ol_tx_sched.c

@@ -881,8 +881,7 @@ ol_tx_sched_select_batch_wrr_adv(
 	} else {
 		used_credits = 0;
 		/* TODO: find its reason */
-		QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,
-			  "ol_tx_sched_select_batch_wrr_adv: error, no TXQ can be popped.");
+		ol_txrx_err("Error, no TXQ can be popped");
 	}
 	return used_credits;
 }

core/hdd/src/wlan_hdd_assoc.c

@@ -1337,8 +1337,6 @@ static void hdd_send_association_event(struct net_device *dev,
 #ifdef WLAN_FEATURE_ROAM_OFFLOAD
 	if (NULL != pCsrRoamInfo)
 		if (pCsrRoamInfo->roamSynchInProgress) {
-			/* change logging before release */
-			hdd_debug("LFR3:hdd_send_association_event");
 			/* Update tdls module about the disconnection event */
 			hdd_notify_sta_disconnect(adapter->session_id,
 						 true, false,

core/hdd/src/wlan_hdd_main.c

@@ -12462,7 +12462,7 @@ static ssize_t wlan_hdd_state_ctrl_param_write(struct file *filp,
 		rc = wait_for_completion_timeout(&wlan_start_comp,
 				msecs_to_jiffies(HDD_WLAN_START_WAIT_TIME));
 		if (!rc) {
-			hdd_alert("Timed-out waiting in wlan_hdd_state_ctrl_param_write");
+			hdd_alert("Timed-out!!");
 			ret = -EINVAL;
 			return ret;
 		}

core/mac/src/pe/lim/lim_api.c

@@ -1019,7 +1019,7 @@ static void pe_free_nested_messages(struct scheduler_msg *msg)
 {
 	switch (msg->type) {
 	case WMA_SET_LINK_STATE_RSP:
-		pe_debug("pe_free_nested_messages: WMA_SET_LINK_STATE_RSP");
+		pe_debug("WMA_SET_LINK_STATE_RSP");
 		qdf_mem_free(((tpLinkStateParams) msg->bodyptr)->callbackArg);
 		break;
 	default:

core/mac/src/pe/lim/lim_assoc_utils.c

@@ -2016,8 +2016,7 @@ QDF_STATUS lim_populate_matching_rate_set(tpAniSirGlobal mac_ctx,
 			sta_ds->supportedRates.supportedMCSSet[i] =
 				mcs_set[i] & supported_mcs_set[i];
 
-		pe_debug("lim_populate_matching_rate_set: MCS Rate Set Bitmap"
-				" from  CFG and DPH : ");
+		pe_debug("MCS Rate Set Bitmap from CFG and DPH: ");
 		for (i = 0; i < SIR_MAC_MAX_SUPPORTED_MCS_SET; i++) {
 			pe_debug("%x %x ", mcs_set[i],
 			    sta_ds->supportedRates.supportedMCSSet[i]);
@@ -3359,7 +3358,7 @@ QDF_STATUS lim_extract_ap_capabilities(tpAniSirGlobal pMac,
 {
 	qdf_mem_set((uint8_t *) beaconStruct, sizeof(tSirProbeRespBeacon), 0);
 
-	pe_debug("lim_extract_ap_capabilities: The IE's being received are:");
+	pe_debug("The IE's being received are:");
 	QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG,
 				pIE, ieLen);
 	/* Parse the Beacon IE's, Don't try to parse if we dont have anything in IE */

core/mac/src/pe/lim/lim_ft.c

@@ -534,7 +534,6 @@ void lim_fill_ft_session(tpAniSirGlobal pMac,
 
 	pBeaconStruct = qdf_mem_malloc(sizeof(tSchBeaconStruct));
 	if (NULL == pBeaconStruct) {
-		pe_err("No memory for creating lim_fill_ft_session");
 		return;
 	}
 

core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c

@@ -2455,11 +2455,6 @@ lim_process_sta_mlm_add_bss_rsp(tpAniSirGlobal mac_ctx,
 
 	if (add_bss_params == 0)
 		goto end;
-#ifdef WLAN_FEATURE_ROAM_OFFLOAD
-	if (session_entry->bRoamSynchInProgress)
-		QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG,
-			"LFR3:lim_process_sta_mlm_add_bss_rsp");
-#endif
 
 	if (QDF_STATUS_SUCCESS == add_bss_params->status) {
 		if (eLIM_MLM_WT_ADD_BSS_RSP_FT_REASSOC_STATE ==

core/mac/src/pe/lim/lim_prop_exts_utils.c

@@ -219,7 +219,7 @@ lim_extract_ap_capability(tpAniSirGlobal mac_ctx, uint8_t *p_ie,
 	*qos_cap = 0;
 	*prop_cap = 0;
 	*uapsd = 0;
-	pe_debug("In lim_extract_ap_capability: The IE's being received:");
+	pe_debug("The IE's being received:");
 	QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG,
 			   p_ie, ie_len);
 	if (sir_parse_beacon_ie(mac_ctx, beacon_struct, p_ie,

core/mac/src/pe/lim/lim_send_messages.c

@@ -689,7 +689,6 @@ QDF_STATUS lim_send_exclude_unencrypt_ind(tpAniSirGlobal pMac,
 	pExcludeUnencryptParam =
 		qdf_mem_malloc(sizeof(tSirWlanExcludeUnencryptParam));
 	if (NULL == pExcludeUnencryptParam) {
-		pe_err("Unable to allocate memory during lim_send_exclude_unencrypt_ind");
 		return QDF_STATUS_E_NOMEM;
 	}
 

core/mac/src/pe/sch/sch_api.c

@@ -414,13 +414,10 @@ uint32_t lim_send_probe_rsp_template_to_hal(tpAniSirGlobal pMac,
 
 		retCode = wma_post_ctrl_msg(pMac, &msgQ);
 		if (QDF_STATUS_SUCCESS != retCode) {
-			pe_err("lim_send_probe_rsp_template_to_hal: FAIL bytes %d retcode[%X]",
-				nBytes, retCode);
+			pe_err("FAIL bytes %d retcode[%X]", nBytes, retCode);
 			qdf_mem_free(pprobeRespParams);
 		} else {
-			pe_debug(
-				FL
-					("lim_send_probe_rsp_template_to_hal: Probe response template msg posted to HAL of bytes %d"),
+			pe_debug("Probe response template msg posted to HAL of bytes %d",
 				nBytes);
 		}
 	}

core/mac/src/sys/legacy/src/utils/src/parser_api.c

@@ -133,7 +133,7 @@ int find_ie_location(tpAniSirGlobal pMac, tpSirRSNie pRsnIe, uint8_t EID)
 		} else if (EID != pRsnIe->rsnIEdata[idx] &&
 			/* & if no more IE, */
 			   bytesLeft <= (uint16_t) (ieLen)) {
-			pe_debug("No IE (%d) in find_ie_location", EID);
+			pe_debug("No IE (%d)", EID);
 			return ret_val;
 		}
 		bytesLeft -= ieLen;
@@ -1250,7 +1250,7 @@ populate_dot11f_ht_info(tpAniSirGlobal pMac,
 	};
 
 	if (NULL == psessionEntry) {
-		pe_err("Invalid session entry in populate_dot11f_ht_info()");
+		pe_err("Invalid session entry");
 		return QDF_STATUS_E_FAILURE;
 	}
 
@@ -1501,8 +1501,7 @@ populate_dot11f_rsn(tpAniSirGlobal pMac,
 					status);
 				return QDF_STATUS_E_FAILURE;
 			}
-			pe_debug("dot11f_unpack_ie_rsn returned 0x%08x in populate_dot11f_rsn",
-				   status);
+			pe_debug("status 0x%08x", status);
 		}
 
 	}
@@ -1546,12 +1545,10 @@ populate_dot11f_wapi(tpAniSirGlobal pMac,
 						       pRsnIe->rsnIEdata[idx + 1],
 						       pDot11f, false);
 			if (DOT11F_FAILED(status)) {
-				pe_err("Parse failure in populate_dot11f_wapi (0x%08x)",
-					status);
+				pe_err("Parse failure (0x%08x)", status);
 				return QDF_STATUS_E_FAILURE;
 			}
-			pe_debug("dot11f_unpack_ie_rsn returned 0x%08x in populate_dot11f_wapi",
-				   status);
+			pe_debug("status 0x%08x", status);
 		}
 	}
 
@@ -4466,9 +4463,7 @@ sir_convert_addts_req2_struct(tpAniSirGlobal pMac,
 	uint32_t status;
 
 	if (SIR_MAC_QOS_ADD_TS_REQ != *(pFrame + 1)) {
-		pe_err("sir_convert_addts_req2_struct invoked "
-		       "with an Action of %d; this is not "
-		       "supported & is probably an error",
+		pe_err("Action of %d; this is not supported & is probably an error",
 			*(pFrame + 1));
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -4487,9 +4482,7 @@ sir_convert_addts_req2_struct(tpAniSirGlobal pMac,
 							 &wmmaddts, false);
 		break;
 	default:
-		pe_err("sir_convert_addts_req2_struct invoked "
-		       "with a Category of %d; this is not"
-		       " supported & is probably an error",
+		pe_err("Category of %d; this is not supported & is probably an error",
 			*pFrame);
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -4594,9 +4587,7 @@ sir_convert_addts_rsp2_struct(tpAniSirGlobal pMac,
 	uint32_t status;
 
 	if (SIR_MAC_QOS_ADD_TS_RSP != *(pFrame + 1)) {
-		pe_err("sir_convert_addts_rsp2_struct invoked "
-		       "with an Action of %d; this is not "
-		       "supported & is probably an error",
+		pe_err("Action of %d; this is not supported & is probably an error",
 			*(pFrame + 1));
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -4618,9 +4609,7 @@ sir_convert_addts_rsp2_struct(tpAniSirGlobal pMac,
 							  &wmmaddts, false);
 		break;
 	default:
-		pe_err("sir_convert_addts_rsp2_struct invoked "
-		       "with a Category of %d; this is not"
-		       " supported & is probably an error",
+		pe_err("Category of %d; this is not supported & is probably an error",
 			*pFrame);
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -5151,8 +5140,7 @@ populate_dot11f_tclas(tpAniSirGlobal pMac,
 			pOld->tclasParams.t8021dq.tag;
 		break;
 	default:
-		pe_err("Bad TCLAS type %d in populate_dot11f_tclas",
-			pDot11f->classifier_type);
+		pe_err("Bad TCLAS type %d", pDot11f->classifier_type);
 		return QDF_STATUS_E_FAILURE;
 	}
 

core/sap/src/sap_ch_select.c

@@ -1549,8 +1549,6 @@ static void sap_compute_spect_weight(tSapChSelSpectInfo *pSpectInfoParams,
 
 	pBeaconStruct = qdf_mem_malloc(sizeof(tSirProbeRespBeacon));
 	if (NULL == pBeaconStruct) {
-		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
-			  "Unable to allocate memory in sap_compute_spect_weight");
 		return;
 	}
 	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,

core/sap/src/sap_fsm.c

@@ -1152,7 +1152,7 @@ QDF_STATUS sap_channel_sel(struct sap_context *sap_context)
 	 * channel cannot advance state machine here as said above
 	 */
 	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
-		  FL("before exiting sap_channel_sel channel=%d"),
+		  FL("Channel: %d"),
 		  sap_context->channel);
 
 	return QDF_STATUS_SUCCESS;
@@ -3625,14 +3625,14 @@ QDF_STATUS sap_init_dfs_channel_nol_list(struct sap_context *sapContext)
 
 	if (NULL == sapContext) {
 		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
-			  "Invalid sapContext pointer on sap_init_dfs_channel_nol_list");
+			  FL("Invalid sapContext pointer"));
 		return QDF_STATUS_E_FAULT;
 	}
 	hHal = CDS_GET_HAL_CB();
 
 	if (NULL == hHal) {
 		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
-			  "In %s invalid hHal", __func__);
+			  FL("Invalid hHal"));
 		return QDF_STATUS_E_FAULT;
 	}
 	pMac = PMAC_STRUCT(hHal);

core/sap/src/sap_module.c

@@ -379,7 +379,7 @@ QDF_STATUS sap_deinit_ctx(struct sap_context *sap_ctx)
 QDF_STATUS sap_destroy_ctx(struct sap_context *sap_ctx)
 {
 	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "sap_destroy_ctx invoked");
+		  FL("Enter"));
 
 	if (NULL == sap_ctx) {
 		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
@@ -655,7 +655,7 @@ QDF_STATUS wlansap_start_bss(struct sap_context *sap_ctx,
 	tpAniSirGlobal pmac = NULL;
 
 	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "wlansap_start_bss: sapContext=%pK", sap_ctx);
+		  FL("sapContext=%pK"), sap_ctx);
 
 	if (NULL == sap_ctx) {
 		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,

core/sme/src/common/sme_api.c

@@ -711,7 +711,7 @@ QDF_STATUS sme_open(tHalHandle hHal)
 	pMac->sme.currDeviceMode = QDF_STA_MODE;
 	if (!QDF_IS_STATUS_SUCCESS(qdf_mutex_create(
 					&pMac->sme.lkSmeGlobalLock))) {
-		sme_err("sme_open failed init lock");
+		sme_err("Init lock failed");
 		return  QDF_STATUS_E_FAILURE;
 	}
 	status = csr_open(pMac);
@@ -4321,7 +4321,6 @@ QDF_STATUS sme_generic_change_country_code(tHalHandle hHal,
 		pMsg = qdf_mem_malloc(sizeof(tAniGenericChangeCountryCodeReq));
 
 		if (NULL == pMsg) {
-			sme_err("sme_generic_change_country_code: failed to allocate mem for req");
 			sme_release_global_lock(&pMac->sme);
 			return QDF_STATUS_E_NOMEM;
 		}
@@ -4338,7 +4337,7 @@ QDF_STATUS sme_generic_change_country_code(tHalHandle hHal,
 
 		if (QDF_STATUS_SUCCESS !=
 		    scheduler_post_msg(QDF_MODULE_ID_SME, &msg)) {
-			sme_err("sme_generic_change_country_code failed to post msg to self");
+			sme_err("Failed to post msg to self");
 			qdf_mem_free(pMsg);
 			status = QDF_STATUS_E_FAILURE;
 		}
@@ -6107,9 +6106,6 @@ QDF_STATUS sme_set_tm_level(tHalHandle hHal, uint16_t newTMLevel, uint16_t
 			(tAniSetTmLevelReq *)
 			qdf_mem_malloc(sizeof(tAniSetTmLevelReq));
 		if (NULL == setTmLevelReq) {
-			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
-				  "%s: Not able to allocate memory for sme_set_tm_level",
-				  __func__);
 			sme_release_global_lock(&pMac->sme);
 			return QDF_STATUS_E_NOMEM;
 		}
@@ -9875,8 +9871,7 @@ QDF_STATUS sme_update_access_policy_vendor_ie(tHalHandle hal,
 
 	msg = qdf_mem_malloc(msg_len);
 	if (!msg) {
-		sme_err("failed to allocate memory for sme_update_access_policy_vendor_ie");
-		return QDF_STATUS_E_FAILURE;
+		return QDF_STATUS_E_NOMEM;
 	}
 
 	msg->msg_type = (uint16_t)eWNI_SME_UPDATE_ACCESS_POLICY_VENDOR_IE;

core/sme/src/common/sme_ft_api.c

@@ -330,7 +330,7 @@ QDF_STATUS sme_ft_update_key(tHalHandle hHal, uint32_t sessionId,
 	if (!(QDF_IS_STATUS_SUCCESS(status)))
 		return QDF_STATUS_E_FAILURE;
 
-	sme_debug("sme_ft_update_key is received in state %d",
+	sme_debug("FT update key is received in state %d",
 		  pSession->ftSmeContext.FTState);
 
 	/* Global Station FT State */

core/sme/src/csr/csr_api_roam.c

@@ -1248,7 +1248,7 @@ QDF_STATUS csr_start(tpAniSirGlobal pMac)
 			status = csr_neighbor_roam_init(pMac, i);
 		csr_init_tl_stats(pMac);
 		if (!QDF_IS_STATUS_SUCCESS(status)) {
-			sme_warn("csr_start: Couldn't Init HO control blk ");
+			sme_warn("Couldn't Init HO control blk");
 			break;
 		}
 		/* Register with scan component */
@@ -1296,7 +1296,7 @@ QDF_STATUS csr_ready(tpAniSirGlobal pMac)
 	 */
 	status = csr_apply_channel_and_power_list(pMac);
 	if (!QDF_IS_STATUS_SUCCESS(status))
-		sme_err("csr_apply_channel_and_power_list failed during csr_ready with status: %d",
+		sme_err("csr_apply_channel_and_power_list failed status: %d",
 			status);
 
 	return status;
@@ -2092,8 +2092,6 @@ QDF_STATUS csr_get_tsm_stats(tpAniSirGlobal pMac,
 
 	pMsg = qdf_mem_malloc(sizeof(tAniGetTsmStatsReq));
 	if (!pMsg) {
-		sme_err(
-			"csr_get_tsm_stats: failed to allocate mem for req");
 		return QDF_STATUS_E_NOMEM;
 	}
 	/* need to initiate a stats request to PE */
@@ -2106,7 +2104,7 @@ QDF_STATUS csr_get_tsm_stats(tpAniSirGlobal pMac,
 	pMsg->pDevContext = pContext;
 	status = umac_send_mb_message_to_mac(pMsg);
 	if (!QDF_IS_STATUS_SUCCESS(status)) {
-		sme_debug("csr_get_tsm_stats: failed to send down the rssi req");
+		sme_debug("Failed to send down the TSM req (status=%d)", status);
 		/* pMsg is freed by cds_send_mb_message_to_mac */
 		status = QDF_STATUS_E_FAILURE;
 	}
@@ -4699,14 +4697,14 @@ csr_roam_get_associated_stas(tpAniSirGlobal pMac, uint32_t sessionId,
 	struct csr_roam_session *pSession = CSR_GET_SESSION(pMac, sessionId);
 
 	if (!pSession) {
-		sme_err("csr_roam_get_associated_stas:CSR Session not found");
+		sme_err("CSR Session not found");
 		return status;
 	}
 	if (pSession->pConnectBssDesc) {
 		qdf_mem_copy(bssId.bytes, pSession->pConnectBssDesc->bssId,
 			     sizeof(struct qdf_mac_addr));
 	} else {
-		sme_err("csr_roam_get_associated_stas:Connected BSS Description in CSR Session not found");
+		sme_err("Connected BSS Description in CSR Session not found");
 		return status;
 	}
 	sme_debug("CSR getting associated stations for Bssid: " MAC_ADDRESS_STR,
@@ -5064,9 +5062,7 @@ static QDF_STATUS csr_roam_get_qos_info_from_bss(tpAniSirGlobal pMac,
 		if (!QDF_IS_STATUS_SUCCESS(
 			csr_get_parsed_bss_description_ies(
 				pMac, pBssDesc, &pIes))) {
-			/* err msg */
-			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
-				  "csr_roam_get_qos_info_from_bss() failed");
+			sme_err("csr_get_parsed_bss_description_ies() failed");
 			break;
 		}
 		/* check if the AP is QAP & it supports APSD */
@@ -13283,17 +13279,13 @@ void csr_roam_wm_status_change_complete(tpAniSirGlobal pMac,
 				    LL_ACCESS_LOCK)) {
 				csr_release_command(pMac, pCommand);
 			} else {
-	sme_err(
-	" ******csr_roam_wm_status_change_complete fail to release command");
+				sme_err("Failed to release command");
 			}
-
 		} else {
-	sme_warn(
-"CSR: WmStatusChange Completion called but LOST LINK command is not ACTIVE ...");
+			sme_warn("CSR: LOST LINK command is not ACTIVE ...");
 		}
 	} else {
-	sme_warn(
-	"CSR: WmStatusChange Completion called but NO commands are ACTIVE ...");
+		sme_warn("CSR: NO commands are ACTIVE ...");
 	}
 }
 
@@ -17789,8 +17781,7 @@ static void csr_roam_link_up(tpAniSirGlobal pMac, struct qdf_mac_addr bssid)
 	 * profile info from pmac global structure
 	 */
 
-	sme_debug(
-		" csr_roam_link_up: WLAN link UP with AP= " MAC_ADDRESS_STR,
+	sme_debug("WLAN link UP with AP= " MAC_ADDRESS_STR,
 		MAC_ADDR_ARRAY(bssid.bytes));
 	/* Check for user misconfig of RSSI trigger threshold */
 	pMac->roam.configParam.vccRssiThreshold =
@@ -18026,8 +18017,7 @@ tListElem *csr_roam_find_in_pe_stats_req_list(
 
 	pEntry = csr_ll_peek_head(&pMac->roam.peStatsReqList, LL_ACCESS_LOCK);
 	if (!pEntry) {
-		/* list empty */
-		sme_debug("csr_roam_find_in_pe_stats_req_list: List empty, no request to PE");
+		sme_debug("List empty, no request to PE");
 		return NULL;
 	}
 	while (pEntry) {
@@ -18158,7 +18148,6 @@ QDF_STATUS csr_get_rssi(tpAniSirGlobal pMac,
 
 	pMsg = qdf_mem_malloc(sizeof(tAniGetRssiReq));
 	if (NULL == pMsg) {
-		sme_err("csr_get_rssi: failed to allocate mem for req ");
 		return QDF_STATUS_E_NOMEM;
 	}
 
@@ -20801,7 +20790,6 @@ QDF_STATUS csr_handoff_request(tpAniSirGlobal pMac,
 
 	pMsg = qdf_mem_malloc(sizeof(tAniHandoffReq));
 	if (NULL == pMsg) {
-		sme_err("csr_handoff_request: failed to allocate mem for req ");
 		return QDF_STATUS_E_NOMEM;
 	}
 	pMsg->msgType = eWNI_SME_HANDOFF_REQ;

core/sme/src/csr/csr_neighbor_roam.c

@@ -1121,8 +1121,7 @@ QDF_STATUS csr_neighbor_roam_indicate_connect(
 	if (session->roam_synch_in_progress &&
 		(eSIR_ROAM_AUTH_STATUS_AUTHENTICATED ==
 		session->roam_synch_data->authStatus)) {
-		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
-			"LFR3:csr_neighbor_roam_indicate_connect");
+		sme_debug("LFR3: Authenticated");
 		qdf_copy_macaddr(&roamInfo.peerMac,
 			&session->connectedProfile.bssid);
 		roamInfo.roamSynchInProgress =

core/sme/src/csr/csr_util.c

@@ -4252,7 +4252,7 @@ static bool csr_lookup_bkid(tpAniSirGlobal pMac, uint32_t sessionId,
 		fRC = true;
 	} while (0);
 	sme_debug(
-		"csr_lookup_bkid called return match = %d pMac->roam.NumBkidCache = %d",
+		"return match = %d pMac->roam.NumBkidCache = %d",
 		fRC, pSession->NumBkidCache);
 
 	return fRC;
@@ -4637,7 +4637,7 @@ uint8_t csr_retrieve_wpa_ie(tpAniSirGlobal pMac,
 				qdf_mem_copy(pWpaIe, pProfile->pWPAReqIE,
 					     cbWpaIe);
 			} else
-				sme_warn("csr_retrieve_wpa_ie detect invalid WPA IE length (%d)",
+				sme_warn("Invalid WPA IE length: %d",
 					pProfile->nWPAReqIELength);
 		} else
 			cbWpaIe = csr_construct_wpa_ie(pMac, pProfile,
@@ -4671,7 +4671,7 @@ uint8_t csr_retrieve_rsn_ie(tpAniSirGlobal pMac, uint32_t sessionId,
 				qdf_mem_copy(pRsnIe, pProfile->pRSNReqIE,
 					     cbRsnIe);
 			} else {
-				sme_warn("csr_retrieve_rsn_ie detect invalid RSN IE length (%d)",
+				sme_warn("Invalid RSN IE length: %d",
 					pProfile->nRSNReqIELength);
 			}
 			break;
@@ -4706,7 +4706,7 @@ uint8_t csr_retrieve_wapi_ie(tpAniSirGlobal pMac, uint32_t sessionId,
 				qdf_mem_copy(pWapiIe, pProfile->pWAPIReqIE,
 					     cbWapiIe);
 			} else
-				sme_warn("csr_retrieve_wapi_ie detect invalid WAPI IE length (%d)",
+				sme_warn("Invalid WAPI IE length: %d",
 					pProfile->nWAPIReqIELength);
 		} else
 			cbWapiIe =

core/sme/src/nan/nan_api.c

@@ -134,8 +134,7 @@ QDF_STATUS sme_nan_event(tHalHandle hHal, void *pMsg)
 			  FL("msg ptr is NULL"));
 		status = QDF_STATUS_E_FAILURE;
 	} else {
-		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
-			  FL("SME: Received sme_nan_event"));
+		sme_debug("Received eWNI_SME_NAN_EVENT");
 		if (pMac->sme.nan_callback) {
 			pMac->sme.nan_callback(pMac->hdd_handle,
 					      (tSirNanEvent *) pMsg);

core/sme/src/rrm/sme_rrm.c

@@ -1330,8 +1330,7 @@ end:
 QDF_STATUS sme_rrm_msg_processor(tpAniSirGlobal pMac, uint16_t msg_type,
 				 void *pMsgBuf)
 {
-	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
-		  FL(" Msg = %d for RRM measurement"), msg_type);
+	sme_debug("Msg = %d for RRM measurement", msg_type);
 
 	/* switch on the msg type & make the state transition accordingly */
 	switch (msg_type) {
@@ -1344,11 +1343,7 @@ QDF_STATUS sme_rrm_msg_processor(tpAniSirGlobal pMac, uint16_t msg_type,
 		break;
 
 	default:
-		/* err msg */
-		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
-			  FL("sme_rrm_msg_processor:unknown msg type = %d"),
-			  msg_type);
-
+		sme_err("Unknown msg type: %d", msg_type);
 		break;
 	}
 
@@ -1413,10 +1408,7 @@ QDF_STATUS rrm_open(tpAniSirGlobal pMac)
 					(void *)pMac);
 
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-
-		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
-			  "rrm_open: Fail to init timer");
-
+		sme_err("Fail to init measurement timer");
 		return QDF_STATUS_E_FAILURE;
 	}
 
@@ -1427,10 +1419,7 @@ QDF_STATUS rrm_open(tpAniSirGlobal pMac)
 					(void *)pMac);
 
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-
-		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
-			  "rrm_open: Fail to init timer");
-
+		sme_err("Fail to init neighbor rsp wait timer");
 		return QDF_STATUS_E_FAILURE;
 	}
 
@@ -1438,8 +1427,7 @@ QDF_STATUS rrm_open(tpAniSirGlobal pMac)
 
 	qdf_ret_status = csr_ll_open(&pSmeRrmContext->neighborReportCache);
 	if (QDF_STATUS_SUCCESS != qdf_ret_status) {
-		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
-			  "rrm_open: Fail to open neighbor cache result");
+		sme_err("Fail to open neighbor cache result");
 		return QDF_STATUS_E_FAILURE;
 	}
 

core/wma/src/wma_data.c

@@ -1918,7 +1918,7 @@ QDF_STATUS wma_set_thermal_mgmt(tp_wma_handle wma_handle,
 	struct thermal_cmd_params mgmt_thermal_info = {0};
 
 	if (!wma_handle) {
-		WMA_LOGE("%s:'wma_set_thermal_mgmt':invalid input", __func__);
+		wma_err("Invalid input");
 		QDF_ASSERT(0);
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -3069,7 +3069,7 @@ QDF_STATUS wma_lro_config_cmd(void *handle,
 	tp_wma_handle wma = cds_get_context(QDF_MODULE_ID_WMA);
 
 	if (NULL == wma || NULL == wma_lro_cmd) {
-		WMA_LOGE("wma_lro_config_cmd': invalid input!");
+		wma_err("Invalid input!");
 		return QDF_STATUS_E_FAILURE;
 	}
 

core/wma/src/wma_scan_roam.c

@@ -251,7 +251,7 @@ static void wma_roam_scan_fill_fils_params(tp_wma_handle wma_handle,
 	struct roam_fils_params *dst_fils_params, *src_fils_params;
 
 	if (!params || !roam_req || !roam_req->is_fils_connection) {
-		WMA_LOGD("wma_roam_scan_fill_fils_params- NULL");
+		wma_err("Invalid input");
 		return;
 	}