qcacld-3.0: Remove WLAN_VOWIFI_DEBUG and cleanup logging

Feature WLAN_VOWIFI_DEBUG is not defined. Hence remove it.
Also cleanup the logging.

CRs-Fixed: 960105
Change-Id: I76d83d5d5c93aa7e4669a73c0d3300ed5b727bb1

3 files changed, 9 insertions, 33 deletions

diff --git a/core/mac/src/cfg/cfg_api.c b/core/mac/src/cfg/cfg_api.c
index 596794cd4be9..78c0018055aa 100644
--- a/core/mac/src/cfg/cfg_api.c
+++ b/core/mac/src/cfg/cfg_api.c
@@ -819,9 +819,7 @@ tSirRetStatus cfg_get_capability_info(tpAniSirGlobal pMac, uint16_t *pCap,
 		pCapInfo->apsd = 1;
 
 	pCapInfo->rrm = pMac->rrm.rrmSmeContext.rrmConfig.rrm_enabled;
-#if defined WLAN_VOWIFI_DEBUG
-	cfg_log(pMac, LOGE, FL("RRM = %d"), pCapInfo->rrm);
-#endif
+	cfg_log(pMac, LOG1, FL("RRM = %d"), pCapInfo->rrm);
 	/* DSSS-OFDM */
 	/* FIXME : no config defined yet. */
 
diff --git a/core/mac/src/pe/lim/lim_process_mlm_req_messages.c b/core/mac/src/pe/lim/lim_process_mlm_req_messages.c
index e1d3899d033a..22ea9129b71a 100644
--- a/core/mac/src/pe/lim/lim_process_mlm_req_messages.c
+++ b/core/mac/src/pe/lim/lim_process_mlm_req_messages.c
@@ -201,9 +201,7 @@ lim_change_channel_with_callback(tpAniSirGlobal mac_ctx, uint8_t new_chan,
 				 uint32_t *cbdata, tpPESession session_entry)
 {
 	/* Sanity checks for the current and new channel */
-#if defined WLAN_VOWIFI_DEBUG
-	lim_log(mac_ctx, LOGE, FL("Switching channel to %d"), new_chan);
-#endif
+	lim_log(mac_ctx, LOG1, FL("Switching channel to %d"), new_chan);
 	session_entry->channelChangeReasonCode =
 		LIM_SWITCH_CHANNEL_OPERATION;
 
diff --git a/core/mac/src/pe/lim/lim_process_sme_req_messages.c b/core/mac/src/pe/lim/lim_process_sme_req_messages.c
index 3bbbf64c389b..a1833859c6a1 100644
--- a/core/mac/src/pe/lim/lim_process_sme_req_messages.c
+++ b/core/mac/src/pe/lim/lim_process_sme_req_messages.c
@@ -1967,13 +1967,9 @@ __lim_process_sme_join_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf)
 		session->maxTxPower =
 			QDF_MIN(reg_max, (local_power_constraint));
 #endif
-#if defined WLAN_VOWIFI_DEBUG
-		lim_log(mac_ctx, LOGE,
-			"Regulatory max = %d, local power constraint = %d"
-			reg_max, local_power_constraint);
-		lim_log(mac_ctx, LOGE, FL(" max tx = %d"),
-			session->maxTxPower);
-#endif
+		lim_log(mac_ctx, LOG1,
+			FL("Reg max = %d, local power con = %d, max tx = %d"),
+			reg_max, local_power_constraint, session->maxTxPower);
 
 		if (session->gLimCurrentBssUapsd) {
 			session->gUapsdPerAcBitmask =
@@ -2254,12 +2250,9 @@ static void __lim_process_sme_reassoc_req(tpAniSirGlobal mac_ctx,
 		&session_entry->gLimCurrentBssUapsd,
 		&local_pwr_constraint, session_entry);
 	session_entry->maxTxPower = QDF_MIN(reg_max, (local_pwr_constraint));
-#if defined WLAN_VOWIFI_DEBUG
 	lim_log(mac_ctx, LOGE,
-		"Regulatory max = %d, local pwr constraint = %d, max tx = %d",
-		reg_max, local_pwr_constraint,
-		session_entry->maxTxPower);
-#endif
+		FL("Reg max = %d, local pwr constraint = %d, max tx = %d"),
+		reg_max, local_pwr_constraint, session_entry->maxTxPower);
 	/* Copy the SSID from session entry to local variable */
 	session_entry->limReassocSSID.length = reassoc_req->ssId.length;
 	qdf_mem_copy(session_entry->limReassocSSID.ssId,
@@ -4489,10 +4482,7 @@ lim_send_set_max_tx_power_req(tpAniSirGlobal pMac, int8_t txPower,
 	tSirMsgQ msgQ;
 
 	if (pSessionEntry == NULL) {
-		PELOGE(lim_log
-			       (pMac, LOGE, "%s:%d: Inavalid parameters", __func__,
-			       __LINE__);
-		       )
+		lim_log(pMac, LOGE, FL("Inavalid parameters"));
 		return eSIR_FAILURE;
 	}
 
@@ -4503,14 +4493,6 @@ lim_send_set_max_tx_power_req(tpAniSirGlobal pMac, int8_t txPower,
 		return eSIR_MEM_ALLOC_FAILED;
 
 	}
-#if defined(WLAN_VOWIFI_DEBUG) || defined(FEATURE_WLAN_ESE)
-	lim_log(pMac, LOG1,
-		FL("pMaxTxParams allocated...will be freed in other module"));
-#endif
-	if (pMaxTxParams == NULL) {
-		lim_log(pMac, LOGE, FL("pMaxTxParams is NULL"));
-		return eSIR_FAILURE;
-	}
 	pMaxTxParams->power = txPower;
 	qdf_mem_copy(pMaxTxParams->bssId.bytes, pSessionEntry->bssId,
 		     QDF_MAC_ADDR_SIZE);
@@ -4521,9 +4503,7 @@ lim_send_set_max_tx_power_req(tpAniSirGlobal pMac, int8_t txPower,
 	msgQ.type = WMA_SET_MAX_TX_POWER_REQ;
 	msgQ.bodyptr = pMaxTxParams;
 	msgQ.bodyval = 0;
-	PELOG1(lim_log
-		       (pMac, LOG1, FL("Posting WMA_SET_MAX_TX_POWER_REQ to WMA"));
-	       )
+	lim_log(pMac, LOG1, FL("Post WMA_SET_MAX_TX_POWER_REQ to WMA"));
 	MTRACE(mac_trace_msg_tx(pMac, pSessionEntry->peSessionId, msgQ.type));
 	retCode = wma_post_ctrl_msg(pMac, &msgQ);
 	if (eSIR_SUCCESS != retCode) {