qcacmn: Clean up spectral, tif and umac component prints

Clean up spectral, tif and umac component prints by correcting trace levels for regularly occurring prints and removing newlines from converged print APIs since qdf_trace_msg appends them by default. Change-Id: Ib10f1b1c54ecbcb9f4076be7c2c4708359d488e0 CRs-Fixed: 2243843
2018-07-20 14:26:31 +05:30
parent 1c42c27c80
commit f78a3d8ca5
12 changed files with 233 additions and 252 deletions
--- a/umac/cmn_services/crypto/src/wlan_crypto_aes_ccm.c
+++ b/umac/cmn_services/crypto/src/wlan_crypto_aes_ccm.c
@@ -45,8 +45,8 @@ static void aes_ccm_auth_start(void *aes, size_t M, size_t L,
 	wlan_crypto_aes_encrypt(aes, b, x); /* X_1 = E(K, B_0) */

 	if (!aad_len) {
-		qdf_print("%s[%d] aad length should be non zero\n",
-						__func__, __LINE__);
+		qdf_print("%s[%d] aad length should be non zero",
+			  __func__, __LINE__);
 		return;
 	}

--- a/umac/cmn_services/crypto/src/wlan_crypto_ccmp_sw.c
+++ b/umac/cmn_services/crypto/src/wlan_crypto_ccmp_sw.c
@@ -91,7 +91,7 @@ uint8_t *wlan_crypto_ccmp_decrypt(const uint8_t *tk,

 	plain = qdf_mem_malloc(data_len + AES_BLOCK_SIZE);
 	if (plain == NULL) {
-		qdf_print("%s[%d] mem alloc failed\n", __func__, __LINE__);
+		qdf_print("%s[%d] mem alloc failed", __func__, __LINE__);
 		return NULL;
 	}

@@ -151,7 +151,7 @@ uint8_t *wlan_crypto_ccmp_encrypt(const uint8_t *tk, uint8_t *frame,
 	crypt = qdf_mem_malloc(hdrlen + CCMP_IV_SIZE + plen
 				+ WLAN_CRYPTO_MIC_LEN + AES_BLOCK_SIZE);
 	if (crypt == NULL) {
-		qdf_print("%s[%d] mem alloc failed\n", __func__, __LINE__);
+		qdf_print("%s[%d] mem alloc failed", __func__, __LINE__);
 		return NULL;
 	}

@@ -196,7 +196,7 @@ uint8_t *wlan_crypto_ccmp_256_decrypt(const uint8_t *tk,

 	plain = qdf_mem_malloc(data_len + AES_BLOCK_SIZE);
 	if (plain == NULL) {
-		qdf_print("%s[%d] mem alloc failed\n", __func__, __LINE__);
+		qdf_print("%s[%d] mem alloc failed", __func__, __LINE__);
 		return NULL;
 	}

@@ -245,7 +245,7 @@ uint8_t *wlan_crypto_ccmp_256_encrypt(const uint8_t *tk, uint8_t *frame,
 	crypt = qdf_mem_malloc(hdrlen + CCMP_IV_SIZE + plen
 				+ WLAN_CRYPTO_MIC256_LEN + AES_BLOCK_SIZE);
 	if (crypt == NULL) {
-		qdf_print("%s[%d] mem alloc failed\n", __func__, __LINE__);
+		qdf_print("%s[%d] mem alloc failed", __func__, __LINE__);
 		return NULL;
 	}

--- a/umac/cmn_services/crypto/src/wlan_crypto_fils.c
+++ b/umac/cmn_services/crypto/src/wlan_crypto_fils.c
@@ -39,6 +39,8 @@
 #include "wlan_crypto_aes_siv_i.h"
 #endif /* WLAN_SUPPORT_FILS */

+#include <qdf_trace.h>
+
 #define ASSOC_RESP_FIXED_FIELDS_LEN  6 /* cap info + status + assoc id */
 #define ASSOC_REQ_FIXED_FIELDS_LEN   4 /* cap info + listen interval */
 #define REASSOC_REQ_FIXED_FIELDS_LEN 10 /* cap info + listen interval + BSSID */
@@ -75,8 +77,8 @@ fils_parse_ie(qdf_nbuf_t wbuf, uint8_t hdrlen, uint8_t **cap_info,
 	pktlen_left = qdf_nbuf_len(wbuf);

 	if (pktlen_left < hdrlen) {
-		qdf_print(FL("Parse error.pktlen_left:%d Framehdr size:%d\n"),
-			  pktlen_left, hdrlen);
+		qdf_err("Parse error.pktlen_left:%d Framehdr size:%d",
+			pktlen_left, hdrlen);
 		return QDF_STATUS_E_INVAL;
 	}

@@ -90,8 +92,7 @@ fils_parse_ie(qdf_nbuf_t wbuf, uint8_t hdrlen, uint8_t **cap_info,
 	    subtype == WLAN_FC0_STYPE_REASSOC_RESP) {
 		/* assoc resp frame - capability (2), status (2), associd (2) */
 		if (pktlen_left < ASSOC_RESP_FIXED_FIELDS_LEN) {
-			qdf_print(
-			FL("Parse error.pktlen_left:%d Fixed Fields len:%d\n"),
+			qdf_err("Parse error.pktlen_left:%d Fixed Fields len:%d",
 				pktlen_left, ASSOC_RESP_FIXED_FIELDS_LEN);
 			return QDF_STATUS_E_INVAL;
 		}
@@ -101,8 +102,7 @@ fils_parse_ie(qdf_nbuf_t wbuf, uint8_t hdrlen, uint8_t **cap_info,
 	} else if (subtype == WLAN_FC0_STYPE_ASSOC_REQ) {
 		/* assoc req frame - capability(2), listen interval (2) */
 		if (pktlen_left < ASSOC_REQ_FIXED_FIELDS_LEN) {
-			qdf_print(
-			FL("Parse Error.pktlen_left:%d Fixed Fields len:%d\n"),
+			qdf_err("Parse Error.pktlen_left:%d Fixed Fields len:%d",
 				pktlen_left, ASSOC_REQ_FIXED_FIELDS_LEN);
 			return QDF_STATUS_E_INVAL;
 		}
@@ -115,8 +115,7 @@ fils_parse_ie(qdf_nbuf_t wbuf, uint8_t hdrlen, uint8_t **cap_info,
 		 * Current AP address(6)
 		 */
 		if (pktlen_left < REASSOC_REQ_FIXED_FIELDS_LEN) {
-			qdf_print(
-			FL("Parse Error.pktlen_left:%d Fixed Fields len:%d\n"),
+			qdf_err("Parse Error.pktlen_left:%d Fixed Fields len:%d",
 				pktlen_left, REASSOC_REQ_FIXED_FIELDS_LEN);
 			return QDF_STATUS_E_INVAL;
 		}
@@ -138,9 +137,9 @@ fils_parse_ie(qdf_nbuf_t wbuf, uint8_t hdrlen, uint8_t **cap_info,
 		/* for extension element, check the sub element ID */
 		if (elem_id == WLAN_ELEMID_EXTN_ELEM) {
 			if ((len + 1) > pktlen_left) {
-				qdf_print(FL("Parse Error.pktlen_left:%did:%d"),
-					  pktlen_left, elem_id);
-				qdf_print("len:%dextid:%d\n", len, *frm);
+				qdf_err("Parse Error.pktlen_left:%did:%d",
+					pktlen_left, elem_id);
+				qdf_err("len:%dextid:%d", len, *frm);
 				return QDF_STATUS_E_INVAL;
 			}

@@ -153,8 +152,7 @@ fils_parse_ie(qdf_nbuf_t wbuf, uint8_t hdrlen, uint8_t **cap_info,
 		}

 		if (len > pktlen_left) {
-			qdf_print(
-			FL("Parse Error.pktlen_left:%did:%dlen:%dextid:%d\n"),
+			qdf_err("Parse Error.pktlen_left:%did:%dlen:%dextid:%d",
 				pktlen_left, elem_id, len, *frm);
 			return QDF_STATUS_E_INVAL;
 		}
@@ -165,7 +163,7 @@ fils_parse_ie(qdf_nbuf_t wbuf, uint8_t hdrlen, uint8_t **cap_info,
 	}

 	if (!fils_found) {
-		qdf_print(FL("FILS session element not found. Parse failed\n"));
+		qdf_err("FILS session element not found. Parse failed");
 		return QDF_STATUS_E_INVAL;
 	}

@@ -187,13 +185,13 @@ static QDF_STATUS fils_aead_setkey(struct wlan_crypto_key *key)
 	struct wlan_crypto_fils_aad_key *fils_key;

 	if (!key || !key->private) {
-		qdf_print(FL("Failed to set FILS key\n"));
+		qdf_err("Failed to set FILS key");
 		return QDF_STATUS_E_INVAL;
 	}
 	req_key = key->private;
 	fils_key = qdf_mem_malloc(sizeof(struct wlan_crypto_fils_aad_key));
 	if (!fils_key) {
-		qdf_print(FL("FILS key alloc failed\n"));
+		qdf_err("FILS key alloc failed");
 		return QDF_STATUS_E_NOMEM;
 	}
 	qdf_mem_copy(fils_key, &req_key->filsaad,
@@ -231,24 +229,24 @@ fils_aead_encap(struct wlan_crypto_key *key, qdf_nbuf_t wbuf,
 	uint8_t subtype = 0;

 	if (!key) {
-		qdf_print(FL("Invalid Input\n"));
+		qdf_err("Invalid Input");
 		return QDF_STATUS_E_FAILURE;
 	}

 	fils_key = (struct wlan_crypto_fils_aad_key *)key->private;
 	if (!fils_key) {
-		qdf_print(FL("Key is not set\n"));
+		qdf_err("Key is not set");
 		return QDF_STATUS_E_FAILURE;
 	}

 	if (!fils_key->kek_len) {
-		qdf_print(FL("Key len is zero. Returning error\n"));
+		qdf_err("Key len is zero. Returning error");
 		return QDF_STATUS_E_FAILURE;
 	}

 	hdr = (struct ieee80211_hdr *)qdf_nbuf_data(wbuf);
 	if (!hdr) {
-		qdf_print(FL("Invalid header\n"));
+		qdf_err("Invalid header");
 		return QDF_STATUS_E_FAILURE;
 	}

@@ -259,7 +257,7 @@ fils_aead_encap(struct wlan_crypto_key *key, qdf_nbuf_t wbuf,

 	if (fils_parse_ie(wbuf, hdrlen, &cap_info, &fils_session, &ie_start)
 			!= QDF_STATUS_SUCCESS) {
-		qdf_print(FL("FILS Parsing failed\n"));
+		qdf_err("FILS Parsing failed");
 		return QDF_STATUS_E_FAILURE;
 	}

@@ -285,7 +283,7 @@ fils_aead_encap(struct wlan_crypto_key *key, qdf_nbuf_t wbuf,
 					+ AES_BLOCK_SIZE;
 	buf = qdf_mem_malloc(bufsize);
 	if (!buf) {
-		qdf_print(FL("temp buf allocation failed\n"));
+		qdf_err("temp buf allocation failed");
 		return QDF_STATUS_E_NOMEM;
 	}
 	qdf_mem_copy(buf, ie_start, bufsize);
@@ -294,13 +292,13 @@ fils_aead_encap(struct wlan_crypto_key *key, qdf_nbuf_t wbuf,
 					fils_session, crypt_len, 5, address,
 					length, buf + (fils_session - ie_start))
 					< 0) {
-		qdf_print(FL("aes siv_encryption failed\n"));
+		qdf_err("aes siv_encryption failed");
 		qdf_mem_free(buf);
 		return QDF_STATUS_E_FAILURE;
 	}

 	if (!qdf_nbuf_put_tail(wbuf, AES_BLOCK_SIZE))
-		qdf_print(FL("Unable to put data in nbuf\n"));
+		qdf_err("Unable to put data in nbuf");

 	qdf_mem_copy(ie_start, buf, bufsize);
 	qdf_mem_free(buf);
@@ -333,30 +331,30 @@ fils_aead_decap(struct wlan_crypto_key *key, qdf_nbuf_t wbuf,
 	uint32_t bufsize = 0;

 	if (!key) {
-		qdf_print(FL("Invalid Input\n"));
+		qdf_err("Invalid Input");
 		return QDF_STATUS_E_FAILURE;
 	}

 	fils_key = (struct wlan_crypto_fils_aad_key *)key->private;
 	if (!fils_key) {
-		qdf_print(FL("Key is not set\n"));
+		qdf_err("Key is not set");
 		return QDF_STATUS_E_FAILURE;
 	}

 	if (!fils_key->kek_len) {
-		qdf_print(FL("Key len is zero. Returning error\n"));
+		qdf_err("Key len is zero. Returning error");
 		return QDF_STATUS_E_FAILURE;
 	}

 	if (fils_parse_ie(wbuf, hdrlen, &cap_info, &fils_session, &ie_start)
 			!= QDF_STATUS_SUCCESS) {
-		qdf_print(FL("IE parse failed\n"));
+		qdf_err("IE parse failed");
 		return QDF_STATUS_E_FAILURE;
 	}

 	hdr = (struct ieee80211_hdr *)qdf_nbuf_data(wbuf);
 	if (!hdr) {
-		qdf_print(FL("Invalid header\n"));
+		qdf_err("Invalid header");
 		return QDF_STATUS_E_FAILURE;
 	}

@@ -379,11 +377,9 @@ fils_aead_decap(struct wlan_crypto_key *key, qdf_nbuf_t wbuf,
 	crypt_len = ((uint8_t *)hdr + (uint32_t)qdf_nbuf_len(wbuf))
 				- fils_session;
 	if (crypt_len < AES_BLOCK_SIZE) {
-		qdf_print(FL(
-			"Not enough room for AES-SIV data after FILS Session"));
-		qdf_print(
-		" element in (Re)Association Request frame from %pM\n",
-						hdr->addr1);
+		qdf_err("Not enough room for AES-SIV data after FILS Session");
+		qdf_err(" element in (Re)Association Request frame from %pM",
+			hdr->addr1);
 		return QDF_STATUS_E_INVAL;
 	}

@@ -391,7 +387,7 @@ fils_aead_decap(struct wlan_crypto_key *key, qdf_nbuf_t wbuf,
 	bufsize = (uint8_t *)hdr + (uint32_t)qdf_nbuf_len(wbuf) - ie_start;
 	buf = qdf_mem_malloc(bufsize);
 	if (!buf) {
-		qdf_print(FL("temp buf allocation failed\n"));
+		qdf_err("temp buf allocation failed");
 		return QDF_STATUS_E_NOMEM;
 	}
 	qdf_mem_copy(buf, ie_start, bufsize);
@@ -400,8 +396,8 @@ fils_aead_decap(struct wlan_crypto_key *key, qdf_nbuf_t wbuf,
 					fils_session, crypt_len, 5, address,
 					length, buf + (fils_session - ie_start))
 					< 0) {
-		qdf_print(FL("AES decrypt of assocreq frame from %s failed\n"),
-			  ether_sprintf(hdr->addr1));
+		qdf_err("AES decrypt of assocreq frame from %s failed",
+			ether_sprintf(hdr->addr1));
 		qdf_mem_free(buf);
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -418,13 +414,13 @@ void wlan_crypto_fils_delkey(struct wlan_objmgr_peer *peer)
 	struct wlan_crypto_key *key = NULL;

 	if (!peer) {
-		qdf_print(FL("Invalid Input\n"));
+		qdf_err("Invalid Input");
 		return;
 	}

 	crypto_priv = wlan_get_peer_crypto_obj(peer);
 	if (!crypto_priv) {
-		qdf_print(FL("crypto_priv NULL\n"));
+		qdf_err("crypto_priv NULL");
 		return;
 	}

--- a/umac/cmn_services/crypto/src/wlan_crypto_gcmp_sw.c
+++ b/umac/cmn_services/crypto/src/wlan_crypto_gcmp_sw.c
@@ -84,7 +84,7 @@ uint8_t *wlan_crypto_gcmp_decrypt(const uint8_t *tk, size_t tk_len,

 	plain = qdf_mem_malloc(data_len + AES_BLOCK_SIZE);
 	if (plain == NULL) {
-		qdf_print("%s[%d] mem alloc failed\n", __func__, __LINE__);
+		qdf_print("%s[%d] mem alloc failed", __func__, __LINE__);
 		return NULL;
 	}

@@ -129,7 +129,7 @@ uint8_t *wlan_crypto_gcmp_encrypt(const uint8_t *tk, size_t tk_len,

 	crypt = qdf_mem_malloc(hdrlen + 8 + plen + 16 + AES_BLOCK_SIZE);
 	if (crypt == NULL) {
-		qdf_print("%s[%d] mem alloc failed\n", __func__, __LINE__);
+		qdf_print("%s[%d] mem alloc failed", __func__, __LINE__);
 		return NULL;
 	}

--- a/umac/cmn_services/crypto/src/wlan_crypto_global_api.c
+++ b/umac/cmn_services/crypto/src/wlan_crypto_global_api.c
@@ -53,7 +53,7 @@ static struct wlan_crypto_params *wlan_crypto_vdev_get_comp_params(
 	*crypto_priv = (struct wlan_crypto_comp_priv *)
 					wlan_get_vdev_crypto_obj(vdev);
 	if (*crypto_priv == NULL) {
-		qdf_print("%s[%d] crypto_priv NULL\n", __func__, __LINE__);
+		qdf_print("%s[%d] crypto_priv NULL", __func__, __LINE__);
 		return NULL;
 	}

@@ -75,7 +75,7 @@ static struct wlan_crypto_params *wlan_crypto_peer_get_comp_params(
 	*crypto_priv = (struct wlan_crypto_comp_priv *)
 					wlan_get_peer_crypto_obj(peer);
 	if (*crypto_priv == NULL) {
-		qdf_print("%s[%d] crypto_priv NULL\n", __func__, __LINE__);
+		qdf_print("%s[%d] crypto_priv NULL", __func__, __LINE__);
 		return NULL;
 	}

@@ -151,7 +151,7 @@ QDF_STATUS wlan_crypto_set_vdev_param(struct wlan_objmgr_vdev *vdev,
 					wlan_get_vdev_crypto_obj(vdev);

 	if (crypto_priv == NULL) {
-		qdf_print("%s[%d] crypto_priv NULL\n", __func__, __LINE__);
+		qdf_print("%s[%d] crypto_priv NULL", __func__, __LINE__);
 		return QDF_STATUS_E_INVAL;
 	}

@@ -184,7 +184,7 @@ QDF_STATUS wlan_crypto_set_peer_param(struct wlan_objmgr_peer *peer,
 							&crypto_priv);

 	if (crypto_priv == NULL) {
-		qdf_print("%s[%d] crypto_priv NULL\n", __func__, __LINE__);
+		qdf_print("%s[%d] crypto_priv NULL", __func__, __LINE__);
 		return QDF_STATUS_E_INVAL;
 	}

@@ -257,7 +257,7 @@ int32_t wlan_crypto_get_param(struct wlan_objmgr_vdev *vdev,
 				wlan_get_vdev_crypto_obj(vdev);

 	if (crypto_priv == NULL) {
-		qdf_print("%s[%d] crypto_priv NULL\n", __func__, __LINE__);
+		qdf_print("%s[%d] crypto_priv NULL", __func__, __LINE__);
 		return QDF_STATUS_E_INVAL;
 	}

@@ -286,7 +286,7 @@ int32_t wlan_crypto_get_peer_param(struct wlan_objmgr_peer *peer,
 							&crypto_priv);

 	if (crypto_params == NULL) {
-		qdf_print("%s[%d] crypto_params NULL\n", __func__, __LINE__);
+		qdf_print("%s[%d] crypto_params NULL", __func__, __LINE__);
 		return QDF_STATUS_E_INVAL;
 	}
 	value = wlan_crypto_get_param_value(param, crypto_params);
@@ -310,7 +310,7 @@ uint8_t wlan_crypto_is_htallowed(struct wlan_objmgr_vdev *vdev,
 	int32_t ucast_cipher;

 	if (!(vdev || peer)) {
-		qdf_print("%s[%d] Invalid params\n", __func__, __LINE__);
+		qdf_print("%s[%d] Invalid params", __func__, __LINE__);
 		return 0;
 	}

@@ -355,8 +355,8 @@ QDF_STATUS wlan_crypto_setkey(struct wlan_objmgr_vdev *vdev,
 	uint8_t igtk_idx = 0;

 	if (!vdev || !req_key || req_key->keylen > (sizeof(req_key->keydata))) {
-		qdf_print("%s[%d] Invalid params vdev%pK, req_key%pK\n",
-				__func__, __LINE__, vdev, req_key);
+		qdf_print("%s[%d] Invalid params vdev%pK, req_key%pK",
+			  __func__, __LINE__, vdev, req_key);
 		return QDF_STATUS_E_INVAL;
 	}

@@ -373,14 +373,14 @@ QDF_STATUS wlan_crypto_setkey(struct wlan_objmgr_vdev *vdev,
 				!isbcast);
 			return QDF_STATUS_SUCCESS;
 		}
-		qdf_print("%s[%d] req_key len zero\n", __func__, __LINE__);
+		qdf_print("%s[%d] req_key len zero", __func__, __LINE__);
 		return QDF_STATUS_E_INVAL;
 	}

 	cipher = wlan_crypto_cipher_ops[req_key->type];

 	if (!cipher && !IS_MGMT_CIPHER(req_key->type)) {
-		qdf_print("%s[%d] cipher invalid\n", __func__, __LINE__);
+		qdf_print("%s[%d] cipher invalid", __func__, __LINE__);
 		return QDF_STATUS_E_INVAL;
 	}

@@ -388,13 +388,13 @@ QDF_STATUS wlan_crypto_setkey(struct wlan_objmgr_vdev *vdev,
 	    (!IS_MGMT_CIPHER(req_key->type)) &&
 	    ((req_key->keylen != (cipher->keylen / CRYPTO_NBBY)) &&
 	    (req_key->type != WLAN_CRYPTO_CIPHER_WEP))) {
-		qdf_print("%s[%d] cipher invalid\n", __func__, __LINE__);
+		qdf_print("%s[%d] cipher invalid", __func__, __LINE__);
 		return QDF_STATUS_E_INVAL;
 	} else if ((req_key->type == WLAN_CRYPTO_CIPHER_WEP) &&
 		!((req_key->keylen == WLAN_CRYPTO_KEY_WEP40_LEN)
 		|| (req_key->keylen == WLAN_CRYPTO_KEY_WEP104_LEN)
 		|| (req_key->keylen == WLAN_CRYPTO_KEY_WEP128_LEN))) {
-		qdf_print("%s[%d] wep key len invalid\n", __func__, __LINE__);
+		qdf_print("%s[%d] wep key len invalid", __func__, __LINE__);
 		return QDF_STATUS_E_INVAL;
 	}

@@ -423,7 +423,7 @@ QDF_STATUS wlan_crypto_setkey(struct wlan_objmgr_vdev *vdev,
 	psoc = wlan_vdev_get_psoc(vdev);
 	if (!psoc) {
 		wlan_vdev_obj_unlock(vdev);
-		qdf_print("%s[%d] psoc NULL\n", __func__, __LINE__);
+		qdf_print("%s[%d] psoc NULL", __func__, __LINE__);
 		return QDF_STATUS_E_INVAL;
 	}
 	wlan_vdev_obj_unlock(vdev);
@@ -439,22 +439,22 @@ QDF_STATUS wlan_crypto_setkey(struct wlan_objmgr_vdev *vdev,
 		crypto_params = wlan_crypto_vdev_get_comp_params(vdev,
 								&crypto_priv);
 		if (crypto_priv == NULL) {
-			qdf_print("%s[%d] crypto_priv NULL\n",
-							__func__, __LINE__);
+			qdf_print("%s[%d] crypto_priv NULL",
+				  __func__, __LINE__);
 			return QDF_STATUS_E_INVAL;
 		}

 		if (IS_MGMT_CIPHER(req_key->type)) {
 			igtk_idx = req_key->keyix - WLAN_CRYPTO_MAXKEYIDX;
 			if (igtk_idx >= WLAN_CRYPTO_MAXIGTKKEYIDX) {
-				qdf_print("%s[%d] igtk key invalid keyid %d \n",
-						  __func__, __LINE__, igtk_idx);
+				qdf_print("%s[%d] igtk key invalid keyid %d ",
+					  __func__, __LINE__, igtk_idx);
 				return QDF_STATUS_E_INVAL;
 			}
 			key = qdf_mem_malloc(sizeof(struct wlan_crypto_key));
 			if (key == NULL) {
-				qdf_print("%s[%d] igtk key alloc failed\n",
-						__func__, __LINE__);
+				qdf_print("%s[%d] igtk key alloc failed",
+					  __func__, __LINE__);
 				return QDF_STATUS_E_NOMEM;
 			}

@@ -466,7 +466,7 @@ QDF_STATUS wlan_crypto_setkey(struct wlan_objmgr_vdev *vdev,
 			crypto_priv->def_igtk_tx_keyid = igtk_idx;
 		} else {
 			if (IS_FILS_CIPHER(req_key->type)) {
-				qdf_print("FILS key is not for BroadCast pkt");
+				qdf_err("FILS key is not for BroadCast pkt");
 				return QDF_STATUS_E_INVAL;
 			}
 			if (!HAS_MCAST_CIPHER(crypto_params, req_key->type)
@@ -487,8 +487,8 @@ QDF_STATUS wlan_crypto_setkey(struct wlan_objmgr_vdev *vdev,
 			if (!(peer && (QDF_STATUS_SUCCESS
 				== wlan_objmgr_peer_try_get_ref(peer,
 							WLAN_CRYPTO_ID)))) {
-				qdf_print("%s[%d] peer %pK failed\n",
-						__func__, __LINE__, peer);
+				qdf_print("%s[%d] peer %pK failed",
+					  __func__, __LINE__, peer);
 				if (IS_MGMT_CIPHER(req_key->type)) {
 					crypto_priv->igtk_key[igtk_idx] = NULL;
 					crypto_priv->igtk_key_type
@@ -516,7 +516,7 @@ QDF_STATUS wlan_crypto_setkey(struct wlan_objmgr_vdev *vdev,
 					WLAN_CRYPTO_ID);

 		if (peer == NULL) {
-			qdf_print("%s[%d] peer NULL\n", __func__, __LINE__);
+			qdf_print("%s[%d] peer NULL", __func__, __LINE__);
 			return QDF_STATUS_E_INVAL;
 		}

@@ -526,21 +526,21 @@ QDF_STATUS wlan_crypto_setkey(struct wlan_objmgr_vdev *vdev,
 		wlan_objmgr_peer_release_ref(peer, WLAN_CRYPTO_ID);

 		if (crypto_priv == NULL) {
-			qdf_print("%s[%d] crypto_priv NULL\n",
-							__func__, __LINE__);
+			qdf_print("%s[%d] crypto_priv NULL",
+				  __func__, __LINE__);
 			return QDF_STATUS_E_INVAL;
 		}
 		if (IS_MGMT_CIPHER(req_key->type)) {
 			igtk_idx = req_key->keyix - WLAN_CRYPTO_MAXKEYIDX;
 			if (igtk_idx >= WLAN_CRYPTO_MAXIGTKKEYIDX) {
-				qdf_print("%s[%d] igtk key invalid keyid %d \n",
-						  __func__, __LINE__, igtk_idx);
+				qdf_print("%s[%d] igtk key invalid keyid %d ",
+					  __func__, __LINE__, igtk_idx);
 				return QDF_STATUS_E_INVAL;
 			}
 			key = qdf_mem_malloc(sizeof(struct wlan_crypto_key));
 			if (key == NULL) {
-				qdf_print("%s[%d] igtk key alloc failed\n",
-						__func__, __LINE__);
+				qdf_print("%s[%d] igtk key alloc failed",
+					  __func__, __LINE__);
 				return QDF_STATUS_E_NOMEM;
 			}
 			if (crypto_priv->igtk_key[igtk_idx])
@@ -554,8 +554,8 @@ QDF_STATUS wlan_crypto_setkey(struct wlan_objmgr_vdev *vdev,
 			if (kid == WLAN_CRYPTO_KEYIX_NONE)
 				kid = 0;
 			if (kid >= WLAN_CRYPTO_MAXKEYIDX) {
-				qdf_print("%s[%d] invalid keyid %d \n",
-						  __func__, __LINE__, kid);
+				qdf_print("%s[%d] invalid keyid %d ",
+					  __func__, __LINE__, kid);
 				return QDF_STATUS_E_INVAL;
 			}
 			if (!crypto_priv->key[kid]) {
@@ -696,7 +696,7 @@ struct wlan_crypto_key *wlan_crypto_vdev_getkey(struct wlan_objmgr_vdev *vdev,
 	crypto_params = wlan_crypto_vdev_get_comp_params(vdev, &crypto_priv);

 	if (crypto_priv == NULL) {
-		qdf_print("%s[%d] crypto_priv NULL\n", __func__, __LINE__);
+		qdf_print("%s[%d] crypto_priv NULL", __func__, __LINE__);
 		return NULL;
 	}

@@ -730,7 +730,7 @@ struct wlan_crypto_key *wlan_crypto_peer_getkey(struct wlan_objmgr_peer *peer,
 	crypto_params = wlan_crypto_peer_get_comp_params(peer, &crypto_priv);

 	if (crypto_priv == NULL) {
-		qdf_print("%s[%d] crypto_priv NULL\n", __func__, __LINE__);
+		qdf_print("%s[%d] crypto_priv NULL", __func__, __LINE__);
 		return NULL;
 	}

@@ -767,8 +767,8 @@ QDF_STATUS wlan_crypto_getkey(struct wlan_objmgr_vdev *vdev,

 	if ((req_key->keyix != WLAN_CRYPTO_KEYIX_NONE) &&
 		(req_key->keyix >= WLAN_CRYPTO_MAXKEYIDX)) {
-		qdf_print("%s[%d] invalid keyix %d\n", __func__, __LINE__,
-							req_key->keyix);
+		qdf_print("%s[%d] invalid keyix %d", __func__, __LINE__,
+			  req_key->keyix);
 		return QDF_STATUS_E_INVAL;
 	}

@@ -777,7 +777,7 @@ QDF_STATUS wlan_crypto_getkey(struct wlan_objmgr_vdev *vdev,
 	psoc = wlan_vdev_get_psoc(vdev);
 	if (!psoc) {
 		wlan_vdev_obj_unlock(vdev);
-		qdf_print("%s[%d] psoc NULL\n", __func__, __LINE__);
+		qdf_print("%s[%d] psoc NULL", __func__, __LINE__);
 		return QDF_STATUS_E_INVAL;
 	}
 	wlan_vdev_obj_unlock(vdev);
@@ -800,7 +800,7 @@ QDF_STATUS wlan_crypto_getkey(struct wlan_objmgr_vdev *vdev,
 					WLAN_CRYPTO_ID);
 		if (peer == NULL) {
 			QDF_TRACE(QDF_MODULE_ID_CRYPTO, QDF_TRACE_LEVEL_ERROR,
-				"%s[%d] peer NULL\n", __func__, __LINE__);
+				"%s[%d] peer NULL", __func__, __LINE__);
 			return QDF_STATUS_E_NOENT;
 		}
 		key = wlan_crypto_peer_getkey(peer, req_key->keyix);
@@ -864,9 +864,9 @@ QDF_STATUS wlan_crypto_delkey(struct wlan_objmgr_vdev *vdev,
 		(key_idx >=
 			(WLAN_CRYPTO_MAXKEYIDX + WLAN_CRYPTO_MAXIGTKKEYIDX))) {
 			QDF_TRACE(QDF_MODULE_ID_CRYPTO, QDF_TRACE_LEVEL_ERROR,
-				"%s[%d] Invalid params vdev %pK, macaddr %pK"
-					"keyidx %d\n", __func__, __LINE__, vdev,
-					macaddr, key_idx);
+				  "%s[%d] Invalid params vdev %pK, macaddr %pK, keyidx %d",
+				  __func__, __LINE__, vdev,
+				  macaddr, key_idx);
 		return QDF_STATUS_E_INVAL;
 	}

@@ -875,7 +875,7 @@ QDF_STATUS wlan_crypto_delkey(struct wlan_objmgr_vdev *vdev,
 	psoc = wlan_vdev_get_psoc(vdev);
 	if (!psoc) {
 		wlan_vdev_obj_unlock(vdev);
-		qdf_print("%s[%d] psoc NULL\n", __func__, __LINE__);
+		qdf_print("%s[%d] psoc NULL", __func__, __LINE__);
 		return QDF_STATUS_E_INVAL;
 	}
 	wlan_vdev_obj_unlock(vdev);
@@ -884,8 +884,8 @@ QDF_STATUS wlan_crypto_delkey(struct wlan_objmgr_vdev *vdev,
 		crypto_params = wlan_crypto_vdev_get_comp_params(vdev,
 								&crypto_priv);
 		if (crypto_priv == NULL) {
-			qdf_print("%s[%d] crypto_priv NULL\n",
-							__func__, __LINE__);
+			qdf_print("%s[%d] crypto_priv NULL",
+				  __func__, __LINE__);
 			return QDF_STATUS_E_INVAL;
 		}
 	} else {
@@ -906,8 +906,8 @@ QDF_STATUS wlan_crypto_delkey(struct wlan_objmgr_vdev *vdev,
 								&crypto_priv);
 		wlan_objmgr_peer_release_ref(peer, WLAN_CRYPTO_ID);
 		if (crypto_priv == NULL) {
-			qdf_print("%s[%d] crypto_priv NULL\n",
-							__func__, __LINE__);
+			qdf_print("%s[%d] crypto_priv NULL",
+				  __func__, __LINE__);
 			return QDF_STATUS_E_INVAL;
 		}
 	}
@@ -915,8 +915,8 @@ QDF_STATUS wlan_crypto_delkey(struct wlan_objmgr_vdev *vdev,
 	if (key_idx >= WLAN_CRYPTO_MAXKEYIDX) {
 		uint8_t igtk_idx = key_idx - WLAN_CRYPTO_MAXKEYIDX;
 		if (igtk_idx >= WLAN_CRYPTO_MAXIGTKKEYIDX) {
-			qdf_print("%s[%d] Igtk key invalid keyid %d\n",
-			__func__, __LINE__, igtk_idx);
+			qdf_print("%s[%d] Igtk key invalid keyid %d",
+				  __func__, __LINE__, igtk_idx);
 			return QDF_STATUS_E_INVAL;
 		}
 		key = crypto_priv->igtk_key[igtk_idx];
@@ -967,9 +967,9 @@ QDF_STATUS wlan_crypto_default_key(struct wlan_objmgr_vdev *vdev,
 	uint8_t bssid_mac[WLAN_ALEN];

 	if (!vdev || !macaddr || (key_idx >= WLAN_CRYPTO_MAXKEYIDX)) {
-		qdf_print("%s[%d] Invalid params vdev %pK, macaddr %pK"
-				"keyidx %d\n", __func__, __LINE__,
-				vdev, macaddr, key_idx);
+		qdf_print("%s[%d] Invalid params vdev %pK, macaddr %pK keyidx %d",
+			  __func__, __LINE__,
+			  vdev, macaddr, key_idx);
 		return QDF_STATUS_E_INVAL;
 	}

@@ -978,7 +978,7 @@ QDF_STATUS wlan_crypto_default_key(struct wlan_objmgr_vdev *vdev,
 	psoc = wlan_vdev_get_psoc(vdev);
 	if (!psoc) {
 		wlan_vdev_obj_unlock(vdev);
-		qdf_print("%s[%d] psoc NULL\n", __func__, __LINE__);
+		qdf_print("%s[%d] psoc NULL", __func__, __LINE__);
 		return QDF_STATUS_E_INVAL;
 	}
 	wlan_vdev_obj_unlock(vdev);
@@ -987,8 +987,8 @@ QDF_STATUS wlan_crypto_default_key(struct wlan_objmgr_vdev *vdev,
 		crypto_params = wlan_crypto_vdev_get_comp_params(vdev,
 								&crypto_priv);
 		if (crypto_priv == NULL) {
-			qdf_print("%s[%d] crypto_priv NULL\n",
-							__func__, __LINE__);
+			qdf_print("%s[%d] crypto_priv NULL",
+				  __func__, __LINE__);
 			return QDF_STATUS_E_INVAL;
 		}

@@ -1008,15 +1008,15 @@ QDF_STATUS wlan_crypto_default_key(struct wlan_objmgr_vdev *vdev,
 				WLAN_CRYPTO_ID);

 		if (peer == NULL) {
-			qdf_print("%s[%d] peer NULL\n", __func__, __LINE__);
+			qdf_print("%s[%d] peer NULL", __func__, __LINE__);
 			return QDF_STATUS_E_INVAL;
 		}
 		crypto_params = wlan_crypto_peer_get_comp_params(peer,
 								&crypto_priv);
 		wlan_objmgr_peer_release_ref(peer, WLAN_CRYPTO_ID);
 		if (crypto_priv == NULL) {
-			qdf_print("%s[%d] crypto_priv NULL\n",
-							__func__, __LINE__);
+			qdf_print("%s[%d] crypto_priv NULL",
+				  __func__, __LINE__);
 			return QDF_STATUS_E_INVAL;
 		}

@@ -1069,7 +1069,7 @@ QDF_STATUS wlan_crypto_encap(struct wlan_objmgr_vdev *vdev,
 	psoc = wlan_vdev_get_psoc(vdev);
 	if (!psoc) {
 		wlan_vdev_obj_unlock(vdev);
-		qdf_print("%s[%d] psoc NULL\n", __func__, __LINE__);
+		qdf_print("%s[%d] psoc NULL", __func__, __LINE__);
 		return QDF_STATUS_E_INVAL;
 	}
 	wlan_vdev_obj_unlock(vdev);
@@ -1091,8 +1091,8 @@ QDF_STATUS wlan_crypto_encap(struct wlan_objmgr_vdev *vdev,
 		crypto_params = wlan_crypto_vdev_get_comp_params(vdev,
 								&crypto_priv);
 		if (crypto_priv == NULL) {
-			qdf_print("%s[%d] crypto_priv NULL\n",
-							__func__, __LINE__);
+			qdf_print("%s[%d] crypto_priv NULL",
+				  __func__, __LINE__);
 			return QDF_STATUS_E_INVAL;
 		}

@@ -1111,8 +1111,8 @@ QDF_STATUS wlan_crypto_encap(struct wlan_objmgr_vdev *vdev,
 							  WLAN_CRYPTO_ID);

 		if (peer == NULL) {
-			qdf_print("%s[%d] crypto_priv NULL\n",
-							__func__, __LINE__);
+			qdf_print("%s[%d] crypto_priv NULL",
+				  __func__, __LINE__);
 			return QDF_STATUS_E_INVAL;
 		}
 		crypto_params = wlan_crypto_peer_get_comp_params(peer,
@@ -1120,8 +1120,8 @@ QDF_STATUS wlan_crypto_encap(struct wlan_objmgr_vdev *vdev,
 		wlan_objmgr_peer_release_ref(peer, WLAN_CRYPTO_ID);

 		if (crypto_priv == NULL) {
-			qdf_print("%s[%d] crypto_priv NULL\n",
-							__func__, __LINE__);
+			qdf_print("%s[%d] crypto_priv NULL",
+				  __func__, __LINE__);
 			return QDF_STATUS_E_INVAL;
 		}

@@ -1178,7 +1178,7 @@ QDF_STATUS wlan_crypto_decap(struct wlan_objmgr_vdev *vdev,
 	psoc = wlan_vdev_get_psoc(vdev);
 	if (!psoc) {
 		wlan_vdev_obj_unlock(vdev);
-		qdf_print("%s[%d] psoc NULL\n", __func__, __LINE__);
+		qdf_print("%s[%d] psoc NULL", __func__, __LINE__);
 		return QDF_STATUS_E_INVAL;
 	}
 	wlan_vdev_obj_unlock(vdev);
@@ -1211,8 +1211,8 @@ QDF_STATUS wlan_crypto_decap(struct wlan_objmgr_vdev *vdev,
 		crypto_params = wlan_crypto_vdev_get_comp_params(vdev,
 								&crypto_priv);
 		if (crypto_priv == NULL) {
-			qdf_print("%s[%d] crypto_priv NULL\n",
-							__func__, __LINE__);
+			qdf_print("%s[%d] crypto_priv NULL",
+				  __func__, __LINE__);
 			return QDF_STATUS_E_INVAL;
 		}

@@ -1230,7 +1230,7 @@ QDF_STATUS wlan_crypto_decap(struct wlan_objmgr_vdev *vdev,
 					psoc, pdev_id, bssid_mac,
 					mac_addr, WLAN_CRYPTO_ID);
 		if (peer == NULL) {
-			qdf_print("%s[%d] peer NULL\n", __func__, __LINE__);
+			qdf_print("%s[%d] peer NULL", __func__, __LINE__);
 			return QDF_STATUS_E_INVAL;
 		}

@@ -1239,8 +1239,8 @@ QDF_STATUS wlan_crypto_decap(struct wlan_objmgr_vdev *vdev,
 		wlan_objmgr_peer_release_ref(peer, WLAN_CRYPTO_ID);

 		if (crypto_priv == NULL) {
-			qdf_print("%s[%d] crypto_priv NULL\n",
-							__func__, __LINE__);
+			qdf_print("%s[%d] crypto_priv NULL",
+				  __func__, __LINE__);
 			return QDF_STATUS_E_INVAL;
 		}

@@ -1288,7 +1288,7 @@ QDF_STATUS wlan_crypto_enmic(struct wlan_objmgr_vdev *vdev,
 	psoc = wlan_vdev_get_psoc(vdev);
 	if (!psoc) {
 		wlan_vdev_obj_unlock(vdev);
-		qdf_print("%s[%d] psoc NULL\n", __func__, __LINE__);
+		qdf_print("%s[%d] psoc NULL", __func__, __LINE__);
 		return QDF_STATUS_E_INVAL;
 	}
 	wlan_vdev_obj_unlock(vdev);
@@ -1297,8 +1297,8 @@ QDF_STATUS wlan_crypto_enmic(struct wlan_objmgr_vdev *vdev,
 		crypto_params = wlan_crypto_vdev_get_comp_params(vdev,
 								&crypto_priv);
 		if (crypto_priv == NULL) {
-			qdf_print("%s[%d] crypto_priv NULL\n",
-							__func__, __LINE__);
+			qdf_print("%s[%d] crypto_priv NULL",
+				  __func__, __LINE__);
 			return QDF_STATUS_E_INVAL;
 		}

@@ -1316,8 +1316,8 @@ QDF_STATUS wlan_crypto_enmic(struct wlan_objmgr_vdev *vdev,
 					psoc, pdev_id, bssid_mac,
 					mac_addr, WLAN_CRYPTO_ID);
 		if (peer == NULL) {
-			qdf_print("%s[%d] crypto_priv NULL\n",
-							__func__, __LINE__);
+			qdf_print("%s[%d] crypto_priv NULL",
+				  __func__, __LINE__);
 			return QDF_STATUS_E_INVAL;
 		}

@@ -1326,8 +1326,8 @@ QDF_STATUS wlan_crypto_enmic(struct wlan_objmgr_vdev *vdev,
 		wlan_objmgr_peer_release_ref(peer, WLAN_CRYPTO_ID);

 		if (crypto_priv == NULL) {
-			qdf_print("%s[%d] crypto_priv NULL\n",
-							__func__, __LINE__);
+			qdf_print("%s[%d] crypto_priv NULL",
+				  __func__, __LINE__);
 			return QDF_STATUS_E_INVAL;
 		}

@@ -1388,7 +1388,7 @@ QDF_STATUS wlan_crypto_demic(struct wlan_objmgr_vdev *vdev,
 	psoc = wlan_vdev_get_psoc(vdev);
 	if (!psoc) {
 		wlan_vdev_obj_unlock(vdev);
-		qdf_print("%s[%d] psoc NULL\n", __func__, __LINE__);
+		qdf_print("%s[%d] psoc NULL", __func__, __LINE__);
 		return QDF_STATUS_E_INVAL;
 	}
 	wlan_vdev_obj_unlock(vdev);
@@ -1397,8 +1397,8 @@ QDF_STATUS wlan_crypto_demic(struct wlan_objmgr_vdev *vdev,
 		crypto_params = wlan_crypto_vdev_get_comp_params(vdev,
 								&crypto_priv);
 		if (crypto_priv == NULL) {
-			qdf_print("%s[%d] crypto_priv NULL\n",
-							__func__, __LINE__);
+			qdf_print("%s[%d] crypto_priv NULL",
+				  __func__, __LINE__);
 			return QDF_STATUS_E_INVAL;
 		}

@@ -1416,7 +1416,7 @@ QDF_STATUS wlan_crypto_demic(struct wlan_objmgr_vdev *vdev,
 					psoc, pdev_id, bssid_mac,
 					mac_addr, WLAN_CRYPTO_ID);
 		if (peer == NULL) {
-			qdf_print("%s[%d] peer NULL\n", __func__, __LINE__);
+			qdf_print("%s[%d] peer NULL", __func__, __LINE__);
 			return QDF_STATUS_E_INVAL;
 		}

@@ -1425,8 +1425,8 @@ QDF_STATUS wlan_crypto_demic(struct wlan_objmgr_vdev *vdev,
 		wlan_objmgr_peer_release_ref(peer, WLAN_CRYPTO_ID);

 		if (crypto_priv == NULL) {
-			qdf_print("%s[%d] crypto_priv NULL\n",
-							__func__, __LINE__);
+			qdf_print("%s[%d] crypto_priv NULL",
+				  __func__, __LINE__);
 			return QDF_STATUS_E_INVAL;
 		}

@@ -1460,7 +1460,7 @@ bool wlan_crypto_vdev_is_pmf_enabled(struct wlan_objmgr_vdev *vdev)
 	vdev_crypto_params = wlan_crypto_vdev_get_comp_params(vdev,
 							&crypto_priv);
 	if (crypto_priv == NULL) {
-		qdf_print("%s[%d] crypto_priv NULL\n", __func__, __LINE__);
+		qdf_print("%s[%d] crypto_priv NULL", __func__, __LINE__);
 		return QDF_STATUS_E_INVAL;
 	}

@@ -1494,14 +1494,14 @@ bool wlan_crypto_is_pmf_enabled(struct wlan_objmgr_vdev *vdev,
 	vdev_crypto_params = wlan_crypto_vdev_get_comp_params(vdev,
 							&crypto_priv);
 	if (crypto_priv == NULL) {
-		qdf_print("%s[%d] crypto_priv NULL\n", __func__, __LINE__);
+		qdf_print("%s[%d] crypto_priv NULL", __func__, __LINE__);
 		return QDF_STATUS_E_INVAL;
 	}

 	peer_crypto_params = wlan_crypto_peer_get_comp_params(peer,
 							&crypto_priv);
 	if (crypto_priv == NULL) {
-		qdf_print("%s[%d] crypto_priv NULL\n", __func__, __LINE__);
+		qdf_print("%s[%d] crypto_priv NULL", __func__, __LINE__);
 		return QDF_STATUS_E_INVAL;
 	}
 	if (((vdev_crypto_params->rsn_caps &
@@ -1550,26 +1550,26 @@ uint8_t *wlan_crypto_add_mmie(struct wlan_objmgr_vdev *vdev,
 	int32_t ret = -1;

 	if (!bfrm) {
-		qdf_print("%s[%d] frame is NULL\n", __func__, __LINE__);
+		qdf_print("%s[%d] frame is NULL", __func__, __LINE__);
 		return NULL;
 	}

 	crypto_params = wlan_crypto_vdev_get_comp_params(vdev,
 							&crypto_priv);
 	if (crypto_priv == NULL) {
-		qdf_print("%s[%d] crypto_priv NULL\n", __func__, __LINE__);
+		qdf_print("%s[%d] crypto_priv NULL", __func__, __LINE__);
 		return NULL;
 	}

 	if (crypto_priv->def_igtk_tx_keyid >= WLAN_CRYPTO_MAXIGTKKEYIDX) {
-		qdf_print("%s[%d] igtk key invalid keyid %d \n",
-			__func__, __LINE__, crypto_priv->def_igtk_tx_keyid);
+		qdf_print("%s[%d] igtk key invalid keyid %d ",
+			  __func__, __LINE__, crypto_priv->def_igtk_tx_keyid);
 		return NULL;
 	}

 	key = crypto_priv->igtk_key[crypto_priv->def_igtk_tx_keyid];
 	if (!key) {
-		qdf_print("%s[%d] No igtk key present\n", __func__, __LINE__);
+		qdf_print("%s[%d] No igtk key present", __func__, __LINE__);
 		return NULL;
 	}
 	mic_len = (crypto_priv->igtk_key_type
@@ -1608,7 +1608,7 @@ uint8_t *wlan_crypto_add_mmie(struct wlan_objmgr_vdev *vdev,

 	buf = qdf_mem_malloc(len - hdrlen + 20);
 	if (!buf) {
-		qdf_print("%s[%d] malloc failed\n", __func__, __LINE__);
+		qdf_print("%s[%d] malloc failed", __func__, __LINE__);
 		return NULL;
 	}
 	qdf_mem_zero(buf, len - hdrlen + 20);
@@ -1654,7 +1654,7 @@ uint8_t *wlan_crypto_add_mmie(struct wlan_objmgr_vdev *vdev,
 	}
 	qdf_mem_free(buf);
 	if (ret < 0) {
-		qdf_print("%s[%d] add mmie failed\n", __func__, __LINE__);
+		qdf_print("%s[%d] add mmie failed", __func__, __LINE__);
 		return NULL;
 	}

@@ -1687,14 +1687,14 @@ bool wlan_crypto_is_mmie_valid(struct wlan_objmgr_vdev *vdev,
 	/* check if frame is illegal length */
 	if (!frm || !efrm || (efrm < frm)
 			|| ((efrm - frm) < sizeof(struct ieee80211_hdr))) {
-		qdf_print("%s[%d] Invalid params\n", __func__, __LINE__);
+		qdf_print("%s[%d] Invalid params", __func__, __LINE__);
 		return false;
 	}
 	len = efrm - frm;
 	crypto_priv = (struct wlan_crypto_comp_priv *)
 				wlan_get_vdev_crypto_obj(vdev);
 	if (crypto_priv == NULL) {
-		qdf_print("%s[%d] crypto_priv NULL\n", __func__, __LINE__);
+		qdf_print("%s[%d] crypto_priv NULL", __func__, __LINE__);
 		return false;
 	}

@@ -1713,33 +1713,33 @@ bool wlan_crypto_is_mmie_valid(struct wlan_objmgr_vdev *vdev,

 	/* check Elem ID*/
 	if ((mmie == NULL) || (mmie->element_id != WLAN_ELEMID_MMIE)) {
-		qdf_print("%s[%d] IE is not MMIE\n", __func__, __LINE__);
+		qdf_print("%s[%d] IE is not MMIE", __func__, __LINE__);
 		return false;
 	}

 	if (mmie->key_id >= (WLAN_CRYPTO_MAXKEYIDX +
 				WLAN_CRYPTO_MAXIGTKKEYIDX) ||
 				(mmie->key_id < WLAN_CRYPTO_MAXKEYIDX)) {
-		qdf_print("%s[%d] keyid not valid\n", __func__, __LINE__);
+		qdf_print("%s[%d] keyid not valid", __func__, __LINE__);
 		return false;
 	}

 	key = crypto_priv->igtk_key[mmie->key_id - WLAN_CRYPTO_MAXKEYIDX];
 	if (!key) {
-		qdf_print("%s[%d] No igtk key present\n", __func__, __LINE__);
+		qdf_print("%s[%d] No igtk key present", __func__, __LINE__);
 		return false;
 	}

 	/* validate ipn */
 	ipn = mmie->sequence_number;
 	if (qdf_mem_cmp(ipn, key->keyrsc, 6) <= 0) {
-		qdf_print("%s[%d] replay error\n", __func__, __LINE__);
+		qdf_print("%s[%d] replay error", __func__, __LINE__);
 		return false;
 	}

 	buf = qdf_mem_malloc(len - hdrlen + 20);
 	if (!buf) {
-		qdf_print("%s[%d] malloc failed\n", __func__, __LINE__);
+		qdf_print("%s[%d] malloc failed", __func__, __LINE__);
 		return false;
 	}
 	aad = buf;
@@ -1782,19 +1782,19 @@ bool wlan_crypto_is_mmie_valid(struct wlan_objmgr_vdev *vdev,
 	qdf_mem_free(buf);

 	if (ret < 0) {
-		qdf_print("%s[%d] genarate mmie failed\n", __func__, __LINE__);
+		qdf_print("%s[%d] genarate mmie failed", __func__, __LINE__);
 		return false;
 	}

 	if (qdf_mem_cmp(mic, mmie->mic, mic_len) != 0) {
-		qdf_print("%s[%d] mmie mismatch\n", __func__, __LINE__);
+		qdf_print("%s[%d] mmie mismatch", __func__, __LINE__);
 		/* MMIE MIC mismatch */
 		return false;
 	}

 	/* Update the receive sequence number */
 	qdf_mem_copy(key->keyrsc, ipn, 6);
-	qdf_print("%s[%d] mmie matched\n", __func__, __LINE__);
+	qdf_print("%s[%d] mmie matched", __func__, __LINE__);

 	return true;
 }
@@ -2733,14 +2733,14 @@ uint8_t *wlan_crypto_build_wapiie(struct wlan_objmgr_vdev *vdev,

 	frm = iebuf;
 	if (!frm) {
-		qdf_print("%s[%d] ie buffer NULL\n", __func__, __LINE__);
+		qdf_print("%s[%d] ie buffer NULL", __func__, __LINE__);
 		return NULL;
 	}

 	crypto_params = wlan_crypto_vdev_get_comp_params(vdev, &crypto_priv);

 	if (!crypto_params) {
-		qdf_print("%s[%d] crypto_params NULL\n", __func__, __LINE__);
+		qdf_print("%s[%d] crypto_params NULL", __func__, __LINE__);
 		return NULL;
 	}

@@ -2854,7 +2854,7 @@ QDF_STATUS wlan_crypto_set_peer_wep_keys(struct wlan_objmgr_vdev *vdev,
 		return QDF_STATUS_E_NULL_VALUE;

 	if (!peer) {
-		qdf_print("%s[%d] peer NULL\n", __func__, __LINE__);
+		qdf_print("%s[%d] peer NULL", __func__, __LINE__);
 		return QDF_STATUS_E_INVAL;
 	}

@@ -2862,7 +2862,7 @@ QDF_STATUS wlan_crypto_set_peer_wep_keys(struct wlan_objmgr_vdev *vdev,
 	psoc = wlan_vdev_get_psoc(vdev);

 	if (!psoc) {
-		qdf_print("%s[%d] psoc NULL\n", __func__, __LINE__);
+		qdf_print("%s[%d] psoc NULL", __func__, __LINE__);
 		return QDF_STATUS_E_NULL_VALUE;
 	}

@@ -2873,7 +2873,7 @@ QDF_STATUS wlan_crypto_set_peer_wep_keys(struct wlan_objmgr_vdev *vdev,
 	crypto_params = wlan_crypto_vdev_get_comp_params(vdev,
 							&crypto_priv);
 	if (crypto_priv == NULL) {
-		qdf_print("%s[%d] crypto_priv NULL\n", __func__, __LINE__);
+		qdf_print("%s[%d] crypto_priv NULL", __func__, __LINE__);
 		return QDF_STATUS_E_NULL_VALUE;
 	}

@@ -2884,14 +2884,14 @@ QDF_STATUS wlan_crypto_set_peer_wep_keys(struct wlan_objmgr_vdev *vdev,
 	if (opmode == QDF_STA_MODE) {
 		peer = wlan_vdev_get_bsspeer(vdev);
 		if (!peer) {
-			qdf_print("%s[%d] peer NULL\n", __func__, __LINE__);
+			qdf_print("%s[%d] peer NULL", __func__, __LINE__);
 			return QDF_STATUS_E_INVAL;
 		}
 	}

 	wlan_crypto_peer_get_comp_params(peer, &sta_crypto_priv);
 	if (sta_crypto_priv == NULL) {
-		qdf_print("%s[%d] sta priv is null\n", __func__, __LINE__);
+		qdf_print("%s[%d] sta priv is null", __func__, __LINE__);
 		return QDF_STATUS_E_INVAL;
 	}

@@ -2908,8 +2908,8 @@ QDF_STATUS wlan_crypto_set_peer_wep_keys(struct wlan_objmgr_vdev *vdev,
 				sta_key = qdf_mem_malloc(
 						sizeof(struct wlan_crypto_key));
 				if (!sta_key) {
-					qdf_print("%s[%d] key alloc failed\n",
-							__func__, __LINE__);
+					qdf_print("%s[%d] key alloc failed",
+						  __func__, __LINE__);
 					return QDF_STATUS_E_NOMEM;
 				}
 				sta_crypto_priv->key[i] = sta_key;
@@ -3090,13 +3090,13 @@ uint8_t wlan_crypto_get_peer_fils_aead(struct wlan_objmgr_peer *peer)
 	struct wlan_crypto_comp_priv *crypto_priv = NULL;

 	if (!peer) {
-		qdf_print("Invalid Input");
+		qdf_err("Invalid Input");
 		return 0;
 	}

 	crypto_priv = wlan_get_peer_crypto_obj(peer);
 	if (!crypto_priv) {
-		qdf_print("crypto_priv NULL");
+		qdf_err("crypto_priv NULL");
 		return 0;
 	}

@@ -3109,13 +3109,13 @@ wlan_crypto_set_peer_fils_aead(struct wlan_objmgr_peer *peer, uint8_t value)
 	struct wlan_crypto_comp_priv *crypto_priv = NULL;

 	if (!peer) {
-		qdf_print("Invalid Input");
+		qdf_err("Invalid Input");
 		return;
 	}

 	crypto_priv = wlan_get_peer_crypto_obj(peer);
 	if (!crypto_priv) {
-		qdf_print("crypto_priv NULL");
+		qdf_err("crypto_priv NULL");
 		return;
 	}

@@ -3245,7 +3245,7 @@ static void crypto_plumb_peer_keys(struct wlan_objmgr_vdev *vdev,

 	if ((NULL == peer) || (NULL == vdev) || (NULL == psoc)) {
 		QDF_TRACE(QDF_MODULE_ID_CRYPTO, QDF_TRACE_LEVEL_ERROR,
-			  "%s[%d] Peer or vdev or psoc objects are null!\n",
+			  "%s[%d] Peer or vdev or psoc objects are null!",
 			  __func__, __LINE__);
 		return;
 	}
@@ -3255,7 +3255,7 @@ static void crypto_plumb_peer_keys(struct wlan_objmgr_vdev *vdev,

 	if (!crypto_priv) {
 		QDF_TRACE(QDF_MODULE_ID_CRYPTO, QDF_TRACE_LEVEL_ERROR,
-			  "%s[%d] crypto_priv NULL\n",
+			  "%s[%d] crypto_priv NULL",
 			  __func__, __LINE__);
 		return;
 	}
@@ -3299,13 +3299,13 @@ void wlan_crypto_restore_keys(struct wlan_objmgr_vdev *vdev)
 	psoc = wlan_vdev_get_psoc(vdev);
 	if (NULL == pdev) {
 		QDF_TRACE(QDF_MODULE_ID_CRYPTO, QDF_TRACE_LEVEL_ERROR,
-			  "%s[%d] pdev is NULL\n",
+			  "%s[%d] pdev is NULL",
 			  __func__, __LINE__);
 		return;
 	}
 	if (NULL == psoc) {
 		QDF_TRACE(QDF_MODULE_ID_CRYPTO, QDF_TRACE_LEVEL_ERROR,
-			  "%s[%d] psoc is NULL\n",
+			  "%s[%d] psoc is NULL",
 			  __func__, __LINE__);
 		return;
 	}
@@ -3323,7 +3323,7 @@ void wlan_crypto_restore_keys(struct wlan_objmgr_vdev *vdev)
 			if (!crypto_priv) {
 				QDF_TRACE(QDF_MODULE_ID_CRYPTO,
 					  QDF_TRACE_LEVEL_ERROR,
-					  "%s[%d] crypto_priv is NULL\n",
+					  "%s[%d] crypto_priv is NULL",
 					  __func__, __LINE__);
 				return;
 			}
--- a/umac/cmn_services/crypto/src/wlan_crypto_obj_mgr.c
+++ b/umac/cmn_services/crypto/src/wlan_crypto_obj_mgr.c
@@ -163,8 +163,8 @@ static QDF_STATUS wlan_crypto_peer_obj_create_handler(
 					wlan_peer_get_vdev(peer), peer);
 		}
 	} else {
-		qdf_print("%s[%d] peer obj failed status %d\n",
-					__func__, __LINE__, status);
+		qdf_print("%s[%d] peer obj failed status %d",
+			  __func__, __LINE__, status);
 		qdf_mem_free(crypto_priv);
 	}

@@ -176,7 +176,7 @@ static void wlan_crypto_free_key(struct wlan_crypto_comp_priv *crypto_priv)
 	uint8_t i;

 	if (!crypto_priv) {
-		qdf_print("%s[%d] crypto_priv NULL\n", __func__, __LINE__);
+		qdf_print("%s[%d] crypto_priv NULL", __func__, __LINE__);
 		return;
 	}

@@ -202,7 +202,7 @@ static QDF_STATUS wlan_crypto_vdev_obj_destroy_handler(
 	struct wlan_crypto_comp_priv *crypto_priv;

 	if (!vdev) {
-		qdf_print("%s[%d] Vdev NULL\n", __func__, __LINE__);
+		qdf_print("%s[%d] Vdev NULL", __func__, __LINE__);
 		return QDF_STATUS_E_INVAL;
 	}

@@ -210,7 +210,7 @@ static QDF_STATUS wlan_crypto_vdev_obj_destroy_handler(
 				wlan_get_vdev_crypto_obj(vdev);

 	if (!crypto_priv) {
-		qdf_print("%s[%d] crypto_priv NULL\n", __func__, __LINE__);
+		qdf_print("%s[%d] crypto_priv NULL", __func__, __LINE__);
 		return QDF_STATUS_E_INVAL;
 	}
 	wlan_objmgr_vdev_component_obj_detach(vdev,
@@ -228,13 +228,13 @@ static QDF_STATUS wlan_crypto_peer_obj_destroy_handler(
 	struct wlan_crypto_comp_priv *crypto_priv;

 	if (!peer) {
-		qdf_print("%s[%d] Peer NULL\n", __func__, __LINE__);
+		qdf_print("%s[%d] Peer NULL", __func__, __LINE__);
 		return QDF_STATUS_E_INVAL;
 	}
 	crypto_priv = (struct wlan_crypto_comp_priv *)
 				wlan_get_peer_crypto_obj(peer);
 	if (!crypto_priv) {
-		qdf_print("%s[%d] crypto_priv NULL\n", __func__, __LINE__);
+		qdf_print("%s[%d] crypto_priv NULL", __func__, __LINE__);
 		return QDF_STATUS_E_INVAL;
 	}

--- a/umac/cmn_services/crypto/src/wlan_crypto_wep_sw.c
+++ b/umac/cmn_services/crypto/src/wlan_crypto_wep_sw.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2017-2018 The Linux Foundation. All rights reserved.
 */
 /*
 * Wired Equivalent Privacy (WEP)
@@ -67,7 +67,7 @@ uint8_t *wlan_crypto_wep_encrypt(const uint8_t *key, uint16_t key_len,
 	uint32_t icv;

 	if (data_len < 4 + 4) {
-		qdf_print("%s[%d] invalid len\n", __func__, __LINE__);
+		qdf_print("%s[%d] invalid len", __func__, __LINE__);
 		return NULL;
 	}

@@ -84,7 +84,7 @@ uint8_t *wlan_crypto_wep_decrypt(const uint8_t *key, uint16_t key_len,
 	uint32_t icv, rx_icv;

 	if (data_len < 4 + 4) {
-		qdf_print("%s[%d] invalid len\n", __func__, __LINE__);
+		qdf_print("%s[%d] invalid len", __func__, __LINE__);
 		return NULL;
 	}

@@ -96,7 +96,7 @@ uint8_t *wlan_crypto_wep_decrypt(const uint8_t *key, uint16_t key_len,
 	wlan_crypto_try_wep(k, 3 + key_len, data + 4, data_len - 4, &icv);

 	if (icv != rx_icv) {
-		qdf_print("%s[%d] iv mismatch\n", __func__, __LINE__);
+		qdf_print("%s[%d] iv mismatch", __func__, __LINE__);
 		return NULL;
 	}