qcacld-3.0: Convert wlan_hdd_cfg.c to unified logging

Currently the HDD code uses a variety of logging APIs.  In qcacld-3.0
HDD should converge on a unified set of logging APIs.  Update
wlan_hdd_cfg.c to use the unified set of APIs.

Change-Id: I5d55481198e5b0807afb40a3f7e3962aeb8d728a
CRs-Fixed: 937645

1 files changed, 270 insertions, 539 deletions

diff --git a/core/hdd/src/wlan_hdd_cfg.c b/core/hdd/src/wlan_hdd_cfg.c
index 6405d82d3923..461f1f58fe5a 100644
--- a/core/hdd/src/wlan_hdd_cfg.c
+++ b/core/hdd/src/wlan_hdd_cfg.c
@@ -4365,8 +4365,7 @@ static QDF_STATUS find_cfg_item(tCfgIniEntry *iniTable, unsigned long entries,
 	for (i = 0; i < entries; i++) {
 		if (strcmp(iniTable[i].name, name) == 0) {
 			*value = iniTable[i].value;
-			QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-				  "Found %s entry for Name=[%s] Value=[%s] ",
+			hdd_info("Found %s entry for Name=[%s] Value=[%s] ",
 				  WLAN_INI_FILE, name, *value);
 			return QDF_STATUS_SUCCESS;
 		}
@@ -4461,7 +4460,7 @@ static QDF_STATUS hdd_apply_cfg_ini(hdd_context_t *pHddCtx,
 	int rv;
 
 	if (MAX_CFG_INI_ITEMS < cRegTableEntries) {
-		hddLog(LOGE, FL("MAX_CFG_INI_ITEMS too small, must be at least %ld"),
+		hdd_err("MAX_CFG_INI_ITEMS too small, must be at least %ld",
 		       cRegTableEntries);
 		WARN_ON(1);
 	}
@@ -4477,9 +4476,7 @@ static QDF_STATUS hdd_apply_cfg_ini(hdd_context_t *pHddCtx,
 		if ((match_status != QDF_STATUS_SUCCESS)
 		    && (pRegEntry->Flags & VAR_FLAGS_REQUIRED)) {
 			/* If we could not read the cfg item and it is required, this is an error. */
-			hddLog(LOGE,
-			       "%s: Failed to read required config parameter %s",
-			       __func__, pRegEntry->RegName);
+			hdd_err("Failed to read required config parameter %s", pRegEntry->RegName);
 			ret_status = QDF_STATUS_E_FAILURE;
 			break;
 		}
@@ -4493,9 +4490,7 @@ static QDF_STATUS hdd_apply_cfg_ini(hdd_context_t *pHddCtx,
 			    && (WLAN_PARAM_Integer == pRegEntry->RegType)) {
 				rv = kstrtou32(value_str, 10, &value);
 				if (rv < 0) {
-					hddLog(LOGE,
-					       "%s: Reg Parameter %s invalid. Enforcing default",
-					       __func__, pRegEntry->RegName);
+					hdd_err("Reg Parameter %s invalid. Enforcing default", pRegEntry->RegName);
 					value = pRegEntry->VarDefault;
 				}
 			} else if (match_status == QDF_STATUS_SUCCESS
@@ -4503,9 +4498,7 @@ static QDF_STATUS hdd_apply_cfg_ini(hdd_context_t *pHddCtx,
 				       pRegEntry->RegType)) {
 				rv = kstrtou32(value_str, 16, &value);
 				if (rv < 0) {
-					hddLog(LOGE,
-					       "%s: Reg paramter %s invalid. Enforcing default",
-					       __func__, pRegEntry->RegName);
+					hdd_err("Reg paramter %s invalid. Enforcing default", pRegEntry->RegName);
 					value = pRegEntry->VarDefault;
 				}
 			} else {
@@ -4515,17 +4508,13 @@ static QDF_STATUS hdd_apply_cfg_ini(hdd_context_t *pHddCtx,
 			/* If this parameter needs range checking, do it here. */
 			if (pRegEntry->Flags & VAR_FLAGS_RANGE_CHECK) {
 				if (value > pRegEntry->VarMax) {
-					hddLog(LOGE,
-					       "%s: Reg Parameter %s > allowed Maximum [%u > %lu]. Enforcing Maximum",
-					       __func__, pRegEntry->RegName,
+					hdd_err("Reg Parameter %s > allowed Maximum [%u > %lu]. Enforcing Maximum", pRegEntry->RegName,
 					       value, pRegEntry->VarMax);
 					value = pRegEntry->VarMax;
 				}
 
 				if (value < pRegEntry->VarMin) {
-					hddLog(LOGE,
-					       "%s: Reg Parameter %s < allowed Minimum [%u < %lu]. Enforcing Minimum",
-					       __func__, pRegEntry->RegName,
+					hdd_err("Reg Parameter %s < allowed Minimum [%u < %lu]. Enforcing Minimum", pRegEntry->RegName,
 					       value, pRegEntry->VarMin);
 					value = pRegEntry->VarMin;
 				}
@@ -4534,18 +4523,14 @@ static QDF_STATUS hdd_apply_cfg_ini(hdd_context_t *pHddCtx,
 			else if (pRegEntry->
 				 Flags & VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT) {
 				if (value > pRegEntry->VarMax) {
-					hddLog(LOGE,
-					       "%s: Reg Parameter %s > allowed Maximum [%u > %lu]. Enforcing Default= %lu",
-					       __func__, pRegEntry->RegName,
+					hdd_err("Reg Parameter %s > allowed Maximum [%u > %lu]. Enforcing Default= %lu", pRegEntry->RegName,
 					       value, pRegEntry->VarMax,
 					       pRegEntry->VarDefault);
 					value = pRegEntry->VarDefault;
 				}
 
 				if (value < pRegEntry->VarMin) {
-					hddLog(LOGE,
-					       "%s: Reg Parameter %s < allowed Minimum [%u < %lu]. Enforcing Default= %lu",
-					       __func__, pRegEntry->RegName,
+					hdd_err("Reg Parameter %s < allowed Minimum [%u < %lu]. Enforcing Default= %lu", pRegEntry->RegName,
 					       value, pRegEntry->VarMin,
 					       pRegEntry->VarDefault);
 					value = pRegEntry->VarDefault;
@@ -4560,9 +4545,7 @@ static QDF_STATUS hdd_apply_cfg_ini(hdd_context_t *pHddCtx,
 			if (QDF_STATUS_SUCCESS == match_status) {
 				rv = kstrtos32(value_str, 10, &svalue);
 				if (rv < 0) {
-					hddLog(QDF_TRACE_LEVEL_WARN,
-					       "%s: Reg Parameter %s invalid. Enforcing Default",
-					       __func__, pRegEntry->RegName);
+					hdd_warn("Reg Parameter %s invalid. Enforcing Default", pRegEntry->RegName);
 					svalue =
 						(int32_t) pRegEntry->VarDefault;
 				}
@@ -4573,19 +4556,15 @@ static QDF_STATUS hdd_apply_cfg_ini(hdd_context_t *pHddCtx,
 			/* If this parameter needs range checking, do it here. */
 			if (pRegEntry->Flags & VAR_FLAGS_RANGE_CHECK) {
 				if (svalue > (int32_t) pRegEntry->VarMax) {
-					hddLog(LOGE,
-					       "%s: Reg Parameter %s > allowed Maximum "
-					       "[%d > %d]. Enforcing Maximum",
-					       __func__, pRegEntry->RegName,
+					hdd_err("Reg Parameter %s > allowed Maximum "
+					       "[%d > %d]. Enforcing Maximum", pRegEntry->RegName,
 					       svalue, (int)pRegEntry->VarMax);
 					svalue = (int32_t) pRegEntry->VarMax;
 				}
 
 				if (svalue < (int32_t) pRegEntry->VarMin) {
-					hddLog(LOGE,
-					       "%s: Reg Parameter %s < allowed Minimum "
-					       "[%d < %d]. Enforcing Minimum",
-					       __func__, pRegEntry->RegName,
+					hdd_err("Reg Parameter %s < allowed Minimum "
+					       "[%d < %d]. Enforcing Minimum", pRegEntry->RegName,
 					       svalue, (int)pRegEntry->VarMin);
 					svalue = (int32_t) pRegEntry->VarMin;
 				}
@@ -4594,10 +4573,8 @@ static QDF_STATUS hdd_apply_cfg_ini(hdd_context_t *pHddCtx,
 			else if (pRegEntry->
 				 Flags & VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT) {
 				if (svalue > (int32_t) pRegEntry->VarMax) {
-					hddLog(LOGE,
-					       "%s: Reg Parameter %s > allowed Maximum "
-					       "[%d > %d]. Enforcing Default= %d",
-					       __func__, pRegEntry->RegName,
+					hdd_err("Reg Parameter %s > allowed Maximum "
+					       "[%d > %d]. Enforcing Default= %d", pRegEntry->RegName,
 					       svalue, (int)pRegEntry->VarMax,
 					       (int)pRegEntry->VarDefault);
 					svalue =
@@ -4605,10 +4582,8 @@ static QDF_STATUS hdd_apply_cfg_ini(hdd_context_t *pHddCtx,
 				}
 
 				if (svalue < (int32_t) pRegEntry->VarMin) {
-					hddLog(LOGE,
-					       "%s: Reg Parameter %s < allowed Minimum "
-					       "[%d < %d]. Enforcing Default= %d",
-					       __func__, pRegEntry->RegName,
+					hdd_err("Reg Parameter %s < allowed Minimum "
+					       "[%d < %d]. Enforcing Default= %d", pRegEntry->RegName,
 					       svalue, (int)pRegEntry->VarMin,
 					       (int)pRegEntry->VarDefault);
 					svalue = pRegEntry->VarDefault;
@@ -4620,8 +4595,7 @@ static QDF_STATUS hdd_apply_cfg_ini(hdd_context_t *pHddCtx,
 		/* Handle string parameters */
 		else if (WLAN_PARAM_String == pRegEntry->RegType) {
 #ifdef WLAN_CFG_DEBUG
-			QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-				  "RegName = %s, VarOffset %u VarSize %u VarDefault %s",
+			hdd_info("RegName = %s, VarOffset %u VarSize %u VarDefault %s",
 				  pRegEntry->RegName, pRegEntry->VarOffset,
 				  pRegEntry->VarSize,
 				  (char *)pRegEntry->VarDefault);
@@ -4631,9 +4605,7 @@ static QDF_STATUS hdd_apply_cfg_ini(hdd_context_t *pHddCtx,
 				len_value_str = strlen(value_str);
 
 				if (len_value_str > (pRegEntry->VarSize - 1)) {
-					hddLog(LOGE,
-					       "%s: Invalid Value=[%s] specified for Name=[%s] in %s",
-					       __func__, value_str,
+					hdd_err("Invalid Value=[%s] specified for Name=[%s] in %s", value_str,
 					       pRegEntry->RegName,
 					       WLAN_INI_FILE);
 					cbOutString =
@@ -4663,9 +4635,7 @@ static QDF_STATUS hdd_apply_cfg_ini(hdd_context_t *pHddCtx,
 			}
 		} else if (WLAN_PARAM_MacAddr == pRegEntry->RegType) {
 			if (pRegEntry->VarSize != QDF_MAC_ADDR_SIZE) {
-				hddLog(LOGE,
-				       "%s: Invalid VarSize %u for Name=[%s]",
-				       __func__, pRegEntry->VarSize,
+				hdd_err("Invalid VarSize %u for Name=[%s]", pRegEntry->VarSize,
 				       pRegEntry->RegName);
 				continue;
 			}
@@ -4673,9 +4643,7 @@ static QDF_STATUS hdd_apply_cfg_ini(hdd_context_t *pHddCtx,
 			if (match_status == QDF_STATUS_SUCCESS) {
 				len_value_str = strlen(value_str);
 				if (len_value_str != (QDF_MAC_ADDR_SIZE * 2)) {
-					hddLog(LOGE,
-					       "%s: Invalid MAC addr [%s] specified for Name=[%s] in %s",
-					       __func__, value_str,
+					hdd_err("Invalid MAC addr [%s] specified for Name=[%s] in %s", value_str,
 					       pRegEntry->RegName,
 					       WLAN_INI_FILE);
 				} else
@@ -4689,9 +4657,7 @@ static QDF_STATUS hdd_apply_cfg_ini(hdd_context_t *pHddCtx,
 					       parse_hex_digit(candidate[i * 2 + 1]));
 			}
 		} else {
-			hddLog(LOGE,
-			       "%s: Unknown param type for name[%s] in registry table",
-			       __func__, pRegEntry->RegName);
+			hdd_err("Unknown param type for name[%s] in registry table", pRegEntry->RegName);
 		}
 
 		/* did we successfully parse a cfg item for this parameter? */
@@ -4741,9 +4707,7 @@ static QDF_STATUS hdd_execute_config_command(REG_TABLE_ENTRY *reg_table,
 	/* clone the command so that we can manipulate it */
 	clone = kstrdup(command, GFP_ATOMIC);
 	if (NULL == clone) {
-		hddLog(LOGE,
-		       "%s: memory allocation failure, unable to process [%s]",
-		       __func__, command);
+		hdd_err("memory allocation failure, unable to process [%s]", command);
 		return vstatus;
 	}
 	/* 'clone' will point to the beginning of the string so it can be freed
@@ -4755,8 +4719,7 @@ static QDF_STATUS hdd_execute_config_command(REG_TABLE_ENTRY *reg_table,
 	pCmd = i_trim(pCmd);
 	if ('\0' == *pCmd) {
 		/* only whitespace */
-		hddLog(LOGE, "%s: invalid command, only whitespace:[%s]",
-		       __func__, command);
+		hdd_err("invalid command, only whitespace:[%s]", command);
 		goto done;
 	}
 	/* parse the <name> = <value> */
@@ -4766,8 +4729,7 @@ static QDF_STATUS hdd_execute_config_command(REG_TABLE_ENTRY *reg_table,
 	}
 	if ('\0' == *pCmd) {
 		/* did not find '=' */
-		hddLog(LOGE, "%s: invalid command, no '=':[%s]",
-		       __func__, command);
+		hdd_err("invalid command, no '=':[%s]", command);
 		goto done;
 	}
 	/* replace '=' with NUL to terminate the <name> */
@@ -4775,16 +4737,14 @@ static QDF_STATUS hdd_execute_config_command(REG_TABLE_ENTRY *reg_table,
 	name = i_trim(name);
 	if ('\0' == *name) {
 		/* did not find a name */
-		hddLog(LOGE, "%s: invalid command, no <name>:[%s]",
-		       __func__, command);
+		hdd_err("invalid command, no <name>:[%s]", command);
 		goto done;
 	}
 
 	value_str = i_trim(pCmd);
 	if ('\0' == *value_str) {
 		/* did not find a value */
-		hddLog(LOGE, "%s: invalid command, no <value>:[%s]",
-		       __func__, command);
+		hdd_err("invalid command, no <value>:[%s]", command);
 		goto done;
 	}
 	/* lookup the configuration item */
@@ -4796,17 +4756,15 @@ static QDF_STATUS hdd_execute_config_command(REG_TABLE_ENTRY *reg_table,
 	}
 	if (tableSize == idx) {
 		/* did not match the name */
-		hddLog(LOGE,
-		       "%s: invalid command, unknown configuration item:[%s]",
-		       __func__, command);
+		hdd_err("invalid command, unknown configuration item:[%s]", command);
 		goto done;
 	}
 
 	pRegEntry = &reg_table[idx];
 	if (!(pRegEntry->Flags & VAR_FLAGS_DYNAMIC_CFG)) {
 		/* does not support dynamic configuration */
-		hddLog(LOGE, "%s: Global_Registry_Table.%s does not support "
-		       "dynamic configuration", __func__, name);
+		hdd_err("Global_Registry_Table.%s does not support "
+		       "dynamic configuration", name);
 		vstatus = QDF_STATUS_E_PERM;
 		goto done;
 	}
@@ -4820,16 +4778,12 @@ static QDF_STATUS hdd_execute_config_command(REG_TABLE_ENTRY *reg_table,
 			goto done;
 		if (value < pRegEntry->VarMin) {
 			/* out of range */
-			hddLog(LOGE,
-			       "%s: invalid command, value %u < min value %lu",
-			       __func__, value, pRegEntry->VarMin);
+			hdd_err("invalid command, value %u < min value %lu", value, pRegEntry->VarMin);
 			goto done;
 		}
 		if (value > pRegEntry->VarMax) {
 			/* out of range */
-			hddLog(LOGE,
-			       "%s: invalid command, value %u > max value %lu",
-			       __func__, value, pRegEntry->VarMax);
+			hdd_err("invalid command, value %u > max value %lu", value, pRegEntry->VarMax);
 			goto done;
 		}
 		memcpy(pField, &value, pRegEntry->VarSize);
@@ -4841,16 +4795,12 @@ static QDF_STATUS hdd_execute_config_command(REG_TABLE_ENTRY *reg_table,
 			goto done;
 		if (value < pRegEntry->VarMin) {
 			/* out of range */
-			hddLog(LOGE,
-			       "%s: invalid command, value %x < min value %lx",
-			       __func__, value, pRegEntry->VarMin);
+			hdd_err("invalid command, value %x < min value %lx", value, pRegEntry->VarMin);
 			goto done;
 		}
 		if (value > pRegEntry->VarMax) {
 			/* out of range */
-			hddLog(LOGE,
-			       "%s: invalid command, value %x > max value %lx",
-			       __func__, value, pRegEntry->VarMax);
+			hdd_err("invalid command, value %x > max value %lx", value, pRegEntry->VarMax);
 			goto done;
 		}
 		memcpy(pField, &value, pRegEntry->VarSize);
@@ -4862,16 +4812,12 @@ static QDF_STATUS hdd_execute_config_command(REG_TABLE_ENTRY *reg_table,
 			goto done;
 		if (svalue < (int32_t) pRegEntry->VarMin) {
 			/* out of range */
-			hddLog(LOGE,
-			       "%s: invalid command, value %d < min value %d",
-			       __func__, svalue, (int)pRegEntry->VarMin);
+			hdd_err("invalid command, value %d < min value %d", svalue, (int)pRegEntry->VarMin);
 			goto done;
 		}
 		if (svalue > (int32_t) pRegEntry->VarMax) {
 			/* out of range */
-			hddLog(LOGE,
-			       "%s: invalid command, value %d > max value %d",
-			       __func__, svalue, (int)pRegEntry->VarMax);
+			hdd_err("invalid command, value %d > max value %d", svalue, (int)pRegEntry->VarMax);
 			goto done;
 		}
 		memcpy(pField, &svalue, pRegEntry->VarSize);
@@ -4881,10 +4827,8 @@ static QDF_STATUS hdd_execute_config_command(REG_TABLE_ENTRY *reg_table,
 		len_value_str = strlen(value_str);
 		if (len_value_str > (pRegEntry->VarSize - 1)) {
 			/* too big */
-			hddLog(LOGE,
-			       "%s: invalid command, string [%s] length "
-			       "%zu exceeds maximum length %u",
-			       __func__, value_str,
+			hdd_err("invalid command, string [%s] length "
+			       "%zu exceeds maximum length %u", value_str,
 			       len_value_str, (pRegEntry->VarSize - 1));
 			goto done;
 		}
@@ -4896,10 +4840,8 @@ static QDF_STATUS hdd_execute_config_command(REG_TABLE_ENTRY *reg_table,
 		len_value_str = strlen(value_str);
 		if (len_value_str != (QDF_MAC_ADDR_SIZE * 2)) {
 			/* out of range */
-			hddLog(LOGE,
-			       "%s: invalid command, MAC address [%s] length "
-			       "%zu is not expected length %u",
-			       __func__, value_str,
+			hdd_err("invalid command, MAC address [%s] length "
+			       "%zu is not expected length %u", value_str,
 			       len_value_str, (QDF_MAC_ADDR_SIZE * 2));
 			goto done;
 		}
@@ -4992,655 +4934,459 @@ void hdd_cfg_print(hdd_context_t *pHddCtx)
 {
 	int i;
 
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "*********Config values in HDD Adapter*******");
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [RTSThreshold] Value = %u",
+	hdd_info("*********Config values in HDD Adapter*******");
+	hdd_info("Name = [RTSThreshold] Value = %u",
 		  pHddCtx->config->RTSThreshold);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [OperatingChannel] Value = [%u]",
+	hdd_info("Name = [OperatingChannel] Value = [%u]",
 		  pHddCtx->config->OperatingChannel);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [PowerUsageControl] Value = [%s]",
+	hdd_info("Name = [PowerUsageControl] Value = [%s]",
 		  pHddCtx->config->PowerUsageControl);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [fIsImpsEnabled] Value = [%u]",
+	hdd_info("Name = [fIsImpsEnabled] Value = [%u]",
 		  pHddCtx->config->fIsImpsEnabled);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [nVccRssiTrigger] Value = [%u]",
+	hdd_info("Name = [nVccRssiTrigger] Value = [%u]",
 		  pHddCtx->config->nVccRssiTrigger);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [gIbssBssid] Value =[" MAC_ADDRESS_STR "]",
+	hdd_info("Name = [gIbssBssid] Value =[" MAC_ADDRESS_STR "]",
 		  MAC_ADDR_ARRAY(pHddCtx->config->IbssBssid.bytes));
 
 	for (i = 0; i < QDF_MAX_CONCURRENCY_PERSONA; i++) {
-		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-			  "Name = [Intf%dMacAddress] Value =[" MAC_ADDRESS_STR "]",
+		hdd_info("Name = [Intf%dMacAddress] Value =[" MAC_ADDRESS_STR "]",
 			  i, MAC_ADDR_ARRAY(pHddCtx->config->intfMacAddr[i].bytes));
 	}
 
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [gApEnableUapsd] value = [%u]",
+	hdd_info("Name = [gApEnableUapsd] value = [%u]",
 		  pHddCtx->config->apUapsdEnabled);
 
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [gEnableApProt] value = [%u]",
+	hdd_info("Name = [gEnableApProt] value = [%u]",
 		  pHddCtx->config->apProtEnabled);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [gAPAutoShutOff] Value = [%u]",
+	hdd_info("Name = [gAPAutoShutOff] Value = [%u]",
 		  pHddCtx->config->nAPAutoShutOff);
 #ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [gWlanMccToSccSwitchMode] Value = [%u]",
+	hdd_info("Name = [gWlanMccToSccSwitchMode] Value = [%u]",
 		  pHddCtx->config->WlanMccToSccSwitchMode);
 #endif
 #ifdef FEATURE_WLAN_AUTO_SHUTDOWN
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [gWlanAutoShutdown] Value = [%u]",
+	hdd_info("Name = [gWlanAutoShutdown] Value = [%u]",
 		  pHddCtx->config->WlanAutoShutdown);
 #endif
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [gApProtection] value = [%u]",
+	hdd_info("Name = [gApProtection] value = [%u]",
 		  pHddCtx->config->apProtection);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [gEnableApOBSSProt] value = [%u]",
+	hdd_info("Name = [gEnableApOBSSProt] value = [%u]",
 		  pHddCtx->config->apOBSSProtEnabled);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		"Name = [%s] value = [%u]", CFG_FORCE_SAP_ACS,
+	hdd_info("Name = [%s] value = [%u]", CFG_FORCE_SAP_ACS,
 		pHddCtx->config->force_sap_acs);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		"Name = [%s] value = [%u]", CFG_FORCE_SAP_ACS_START_CH,
+	hdd_info("Name = [%s] value = [%u]", CFG_FORCE_SAP_ACS_START_CH,
 		pHddCtx->config->force_sap_acs_st_ch);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		"Name = [%s] value = [%u]", CFG_FORCE_SAP_ACS_END_CH,
+	hdd_info("Name = [%s] value = [%u]", CFG_FORCE_SAP_ACS_END_CH,
 		pHddCtx->config->force_sap_acs_end_ch);
 #ifdef FEATURE_AP_MCC_CH_AVOIDANCE
-	QDF_TRACE(QDF_MODULE_ID_HDD,
-		  QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [sap_channel_avoidance] value = [%u]",
+	hdd_info("Name = [sap_channel_avoidance] value = [%u]",
 		  pHddCtx->config->sap_channel_avoidance);
 #endif /* FEATURE_AP_MCC_CH_AVOIDANCE */
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		"Name = [%s] value = [%u]", CFG_SAP_P2P_11AC_OVERRIDE_NAME,
+	hdd_info("Name = [%s] value = [%u]", CFG_SAP_P2P_11AC_OVERRIDE_NAME,
 				pHddCtx->config->sap_p2p_11ac_override);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [ChannelBondingMode] Value = [%u]",
+	hdd_info("Name = [ChannelBondingMode] Value = [%u]",
 		  pHddCtx->config->nChannelBondingMode24GHz);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [ChannelBondingMode] Value = [%u]",
+	hdd_info("Name = [ChannelBondingMode] Value = [%u]",
 		  pHddCtx->config->nChannelBondingMode5GHz);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [dot11Mode] Value = [%u]",
+	hdd_info("Name = [dot11Mode] Value = [%u]",
 		  pHddCtx->config->dot11Mode);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [WmmMode] Value = [%u] ", pHddCtx->config->WmmMode);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [UapsdMask] Value = [0x%x] ",
+	hdd_info("Name = [WmmMode] Value = [%u] ", pHddCtx->config->WmmMode);
+	hdd_info("Name = [UapsdMask] Value = [0x%x] ",
 		  pHddCtx->config->UapsdMask);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [ImplicitQosIsEnabled] Value = [%u]",
+	hdd_info("Name = [ImplicitQosIsEnabled] Value = [%u]",
 		  (int)pHddCtx->config->bImplicitQosEnabled);
 
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [InfraUapsdVoSrvIntv] Value = [%u] ",
+	hdd_info("Name = [InfraUapsdVoSrvIntv] Value = [%u] ",
 		  pHddCtx->config->InfraUapsdVoSrvIntv);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [InfraUapsdVoSuspIntv] Value = [%u] ",
+	hdd_info("Name = [InfraUapsdVoSuspIntv] Value = [%u] ",
 		  pHddCtx->config->InfraUapsdVoSuspIntv);
 
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [InfraUapsdViSrvIntv] Value = [%u] ",
+	hdd_info("Name = [InfraUapsdViSrvIntv] Value = [%u] ",
 		  pHddCtx->config->InfraUapsdViSrvIntv);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [InfraUapsdViSuspIntv] Value = [%u] ",
+	hdd_info("Name = [InfraUapsdViSuspIntv] Value = [%u] ",
 		  pHddCtx->config->InfraUapsdViSuspIntv);
 
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [InfraUapsdBeSrvIntv] Value = [%u] ",
+	hdd_info("Name = [InfraUapsdBeSrvIntv] Value = [%u] ",
 		  pHddCtx->config->InfraUapsdBeSrvIntv);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [InfraUapsdBeSuspIntv] Value = [%u] ",
+	hdd_info("Name = [InfraUapsdBeSuspIntv] Value = [%u] ",
 		  pHddCtx->config->InfraUapsdBeSuspIntv);
 
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [InfraUapsdBkSrvIntv] Value = [%u] ",
+	hdd_info("Name = [InfraUapsdBkSrvIntv] Value = [%u] ",
 		  pHddCtx->config->InfraUapsdBkSrvIntv);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [InfraUapsdBkSuspIntv] Value = [%u] ",
+	hdd_info("Name = [InfraUapsdBkSuspIntv] Value = [%u] ",
 		  pHddCtx->config->InfraUapsdBkSuspIntv);
 #ifdef FEATURE_WLAN_ESE
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [InfraInactivityInterval] Value = [%u] ",
+	hdd_info("Name = [InfraInactivityInterval] Value = [%u] ",
 		  pHddCtx->config->InfraInactivityInterval);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [EseEnabled] Value = [%u] ",
+	hdd_info("Name = [EseEnabled] Value = [%u] ",
 		  pHddCtx->config->isEseIniFeatureEnabled);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [FastTransitionEnabled] Value = [%u] ",
+	hdd_info("Name = [FastTransitionEnabled] Value = [%u] ",
 		  pHddCtx->config->isFastTransitionEnabled);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [gTxPowerCap] Value = [%u] dBm ",
+	hdd_info("Name = [gTxPowerCap] Value = [%u] dBm ",
 		  pHddCtx->config->nTxPowerCap);
 #endif
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [gAllowTPCfromAP] Value = [%u] ",
+	hdd_info("Name = [gAllowTPCfromAP] Value = [%u] ",
 		  pHddCtx->config->allow_tpc_from_ap);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [FastRoamEnabled] Value = [%u] ",
+	hdd_info("Name = [FastRoamEnabled] Value = [%u] ",
 		  pHddCtx->config->isFastRoamIniFeatureEnabled);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [MAWCEnabled] Value = [%u] ",
+	hdd_info("Name = [MAWCEnabled] Value = [%u] ",
 		  pHddCtx->config->MAWCEnabled);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [RoamRssiDiff] Value = [%u] ",
+	hdd_info("Name = [RoamRssiDiff] Value = [%u] ",
 		  pHddCtx->config->RoamRssiDiff);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [isWESModeEnabled] Value = [%u] ",
+	hdd_info("Name = [isWESModeEnabled] Value = [%u] ",
 		  pHddCtx->config->isWESModeEnabled);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [OkcEnabled] Value = [%u] ",
+	hdd_info("Name = [OkcEnabled] Value = [%u] ",
 		  pHddCtx->config->isOkcIniFeatureEnabled);
 #ifdef FEATURE_WLAN_SCAN_PNO
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [configPNOScanSupport] Value = [%u] ",
+	hdd_info("Name = [configPNOScanSupport] Value = [%u] ",
 		  pHddCtx->config->configPNOScanSupport);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [configPNOScanTimerRepeatValue] Value = [%u] ",
+	hdd_info("Name = [configPNOScanTimerRepeatValue] Value = [%u] ",
 		  pHddCtx->config->configPNOScanTimerRepeatValue);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [gPNOSlowScanMultiplier] Value = [%u] ",
+	hdd_info("Name = [gPNOSlowScanMultiplier] Value = [%u] ",
 		  pHddCtx->config->pno_slow_scan_multiplier);
 #endif
 #ifdef FEATURE_WLAN_TDLS
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [fEnableTDLSSupport] Value = [%u] ",
+	hdd_info("Name = [fEnableTDLSSupport] Value = [%u] ",
 		  pHddCtx->config->fEnableTDLSSupport);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [fEnableTDLSImplicitTrigger] Value = [%u] ",
+	hdd_info("Name = [fEnableTDLSImplicitTrigger] Value = [%u] ",
 		  pHddCtx->config->fEnableTDLSImplicitTrigger);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [fTDLSExternalControl] Value = [%u] ",
+	hdd_info("Name = [fTDLSExternalControl] Value = [%u] ",
 		  pHddCtx->config->fTDLSExternalControl);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [fTDLSUapsdMask] Value = [%u] ",
+	hdd_info("Name = [fTDLSUapsdMask] Value = [%u] ",
 		  pHddCtx->config->fTDLSUapsdMask);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [fEnableTDLSBufferSta] Value = [%u] ",
+	hdd_info("Name = [fEnableTDLSBufferSta] Value = [%u] ",
 		  pHddCtx->config->fEnableTDLSBufferSta);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [fEnableTDLSWmmMode] Value = [%u] ",
+	hdd_info("Name = [fEnableTDLSWmmMode] Value = [%u] ",
 		  pHddCtx->config->fEnableTDLSWmmMode);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [enable_tdls_scan] Value = [%u]",
+	hdd_info("Name = [enable_tdls_scan] Value = [%u]",
 		  pHddCtx->config->enable_tdls_scan);
 #endif
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [InfraDirAcVo] Value = [%u] ",
+	hdd_info("Name = [InfraDirAcVo] Value = [%u] ",
 		  pHddCtx->config->InfraDirAcVo);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [InfraNomMsduSizeAcVo] Value = [0x%x] ",
+	hdd_info("Name = [InfraNomMsduSizeAcVo] Value = [0x%x] ",
 		  pHddCtx->config->InfraNomMsduSizeAcVo);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [InfraMeanDataRateAcVo] Value = [0x%x] ",
+	hdd_info("Name = [InfraMeanDataRateAcVo] Value = [0x%x] ",
 		  pHddCtx->config->InfraMeanDataRateAcVo);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [InfraMinPhyRateAcVo] Value = [0x%x] ",
+	hdd_info("Name = [InfraMinPhyRateAcVo] Value = [0x%x] ",
 		  pHddCtx->config->InfraMinPhyRateAcVo);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [InfraSbaAcVo] Value = [0x%x] ",
+	hdd_info("Name = [InfraSbaAcVo] Value = [0x%x] ",
 		  pHddCtx->config->InfraSbaAcVo);
 
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [InfraDirAcVi] Value = [%u] ",
+	hdd_info("Name = [InfraDirAcVi] Value = [%u] ",
 		  pHddCtx->config->InfraDirAcVi);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [InfraNomMsduSizeAcVi] Value = [0x%x] ",
+	hdd_info("Name = [InfraNomMsduSizeAcVi] Value = [0x%x] ",
 		  pHddCtx->config->InfraNomMsduSizeAcVi);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [InfraMeanDataRateAcVi] Value = [0x%x] ",
+	hdd_info("Name = [InfraMeanDataRateAcVi] Value = [0x%x] ",
 		  pHddCtx->config->InfraMeanDataRateAcVi);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [InfraMinPhyRateAcVi] Value = [0x%x] ",
+	hdd_info("Name = [InfraMinPhyRateAcVi] Value = [0x%x] ",
 		  pHddCtx->config->InfraMinPhyRateAcVi);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [InfraSbaAcVi] Value = [0x%x] ",
+	hdd_info("Name = [InfraSbaAcVi] Value = [0x%x] ",
 		  pHddCtx->config->InfraSbaAcVi);
 
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [InfraDirAcBe] Value = [%u] ",
+	hdd_info("Name = [InfraDirAcBe] Value = [%u] ",
 		  pHddCtx->config->InfraDirAcBe);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [InfraNomMsduSizeAcBe] Value = [0x%x] ",
+	hdd_info("Name = [InfraNomMsduSizeAcBe] Value = [0x%x] ",
 		  pHddCtx->config->InfraNomMsduSizeAcBe);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [InfraMeanDataRateAcBe] Value = [0x%x] ",
+	hdd_info("Name = [InfraMeanDataRateAcBe] Value = [0x%x] ",
 		  pHddCtx->config->InfraMeanDataRateAcBe);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [InfraMinPhyRateAcBe] Value = [0x%x] ",
+	hdd_info("Name = [InfraMinPhyRateAcBe] Value = [0x%x] ",
 		  pHddCtx->config->InfraMinPhyRateAcBe);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [InfraSbaAcBe] Value = [0x%x] ",
+	hdd_info("Name = [InfraSbaAcBe] Value = [0x%x] ",
 		  pHddCtx->config->InfraSbaAcBe);
 
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [InfraDirAcBk] Value = [%u] ",
+	hdd_info("Name = [InfraDirAcBk] Value = [%u] ",
 		  pHddCtx->config->InfraDirAcBk);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [InfraNomMsduSizeAcBk] Value = [0x%x] ",
+	hdd_info("Name = [InfraNomMsduSizeAcBk] Value = [0x%x] ",
 		  pHddCtx->config->InfraNomMsduSizeAcBk);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [InfraMeanDataRateAcBk] Value = [0x%x] ",
+	hdd_info("Name = [InfraMeanDataRateAcBk] Value = [0x%x] ",
 		  pHddCtx->config->InfraMeanDataRateAcBk);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [InfraMinPhyRateAcBk] Value = [0x%x] ",
+	hdd_info("Name = [InfraMinPhyRateAcBk] Value = [0x%x] ",
 		  pHddCtx->config->InfraMinPhyRateAcBk);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [InfraSbaAcBk] Value = [0x%x] ",
+	hdd_info("Name = [InfraSbaAcBk] Value = [0x%x] ",
 		  pHddCtx->config->InfraSbaAcBk);
 
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [DelayedTriggerFrmInt] Value = [%u] ",
+	hdd_info("Name = [DelayedTriggerFrmInt] Value = [%u] ",
 		  pHddCtx->config->DelayedTriggerFrmInt);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [mcastBcastFilterSetting] Value = [%u] ",
+	hdd_info("Name = [mcastBcastFilterSetting] Value = [%u] ",
 		  pHddCtx->config->mcastBcastFilterSetting);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [fhostArpOffload] Value = [%u] ",
+	hdd_info("Name = [fhostArpOffload] Value = [%u] ",
 		  pHddCtx->config->fhostArpOffload);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [ssdp] Value = [%u] ", pHddCtx->config->ssdp);
+	hdd_info("Name = [ssdp] Value = [%u] ", pHddCtx->config->ssdp);
 	hdd_cfg_print_runtime_pm(pHddCtx);
 #ifdef FEATURE_WLAN_RA_FILTERING
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [RArateLimitInterval] Value = [%u] ",
+	hdd_info("Name = [RArateLimitInterval] Value = [%u] ",
 		  pHddCtx->config->RArateLimitInterval);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [IsRArateLimitEnabled] Value = [%u] ",
+	hdd_info("Name = [IsRArateLimitEnabled] Value = [%u] ",
 		  pHddCtx->config->IsRArateLimitEnabled);
 #endif
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [fFTResourceReqSupported] Value = [%u] ",
+	hdd_info("Name = [fFTResourceReqSupported] Value = [%u] ",
 		  pHddCtx->config->fFTResourceReqSupported);
 
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [nNeighborLookupRssiThreshold] Value = [%u] ",
+	hdd_info("Name = [nNeighborLookupRssiThreshold] Value = [%u] ",
 		  pHddCtx->config->nNeighborLookupRssiThreshold);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [delay_before_vdev_stop] Value = [%u] ",
+	hdd_info("Name = [delay_before_vdev_stop] Value = [%u] ",
 		  pHddCtx->config->delay_before_vdev_stop);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [nOpportunisticThresholdDiff] Value = [%u] ",
+	hdd_info("Name = [nOpportunisticThresholdDiff] Value = [%u] ",
 		  pHddCtx->config->nOpportunisticThresholdDiff);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [nRoamRescanRssiDiff] Value = [%u] ",
+	hdd_info("Name = [nRoamRescanRssiDiff] Value = [%u] ",
 		  pHddCtx->config->nRoamRescanRssiDiff);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [nNeighborScanMinChanTime] Value = [%u] ",
+	hdd_info("Name = [nNeighborScanMinChanTime] Value = [%u] ",
 		  pHddCtx->config->nNeighborScanMinChanTime);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [nNeighborScanMaxChanTime] Value = [%u] ",
+	hdd_info("Name = [nNeighborScanMaxChanTime] Value = [%u] ",
 		  pHddCtx->config->nNeighborScanMaxChanTime);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [nMaxNeighborRetries] Value = [%u] ",
+	hdd_info("Name = [nMaxNeighborRetries] Value = [%u] ",
 		  pHddCtx->config->nMaxNeighborReqTries);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [nNeighborScanPeriod] Value = [%u] ",
+	hdd_info("Name = [nNeighborScanPeriod] Value = [%u] ",
 		  pHddCtx->config->nNeighborScanPeriod);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [nNeighborScanResultsRefreshPeriod] Value = [%u] ",
+	hdd_info("Name = [nNeighborScanResultsRefreshPeriod] Value = [%u] ",
 		  pHddCtx->config->nNeighborResultsRefreshPeriod);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [nEmptyScanRefreshPeriod] Value = [%u] ",
+	hdd_info("Name = [nEmptyScanRefreshPeriod] Value = [%u] ",
 		  pHddCtx->config->nEmptyScanRefreshPeriod);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [nRoamBmissFirstBcnt] Value = [%u] ",
+	hdd_info("Name = [nRoamBmissFirstBcnt] Value = [%u] ",
 		  pHddCtx->config->nRoamBmissFirstBcnt);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [nRoamBmissFinalBcnt] Value = [%u] ",
+	hdd_info("Name = [nRoamBmissFinalBcnt] Value = [%u] ",
 		  pHddCtx->config->nRoamBmissFinalBcnt);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [nRoamBeaconRssiWeight] Value = [%u] ",
+	hdd_info("Name = [nRoamBeaconRssiWeight] Value = [%u] ",
 		  pHddCtx->config->nRoamBeaconRssiWeight);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [allowDFSChannelRoam] Value = [%u] ",
+	hdd_info("Name = [allowDFSChannelRoam] Value = [%u] ",
 		  pHddCtx->config->allowDFSChannelRoam);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [nhi_rssi_scan_max_count] Value = [%u] ",
+	hdd_info("Name = [nhi_rssi_scan_max_count] Value = [%u] ",
 		  pHddCtx->config->nhi_rssi_scan_max_count);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [nhi_rssi_scan_rssi_delta] Value = [%u] ",
+	hdd_info("Name = [nhi_rssi_scan_rssi_delta] Value = [%u] ",
 		  pHddCtx->config->nhi_rssi_scan_rssi_delta);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [nhi_rssi_scan_delay] Value = [%u] ",
+	hdd_info("Name = [nhi_rssi_scan_delay] Value = [%u] ",
 		  pHddCtx->config->nhi_rssi_scan_delay);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [nhi_rssi_scan_rssi_ub] Value = [%u] ",
+	hdd_info("Name = [nhi_rssi_scan_rssi_ub] Value = [%u] ",
 		  pHddCtx->config->nhi_rssi_scan_rssi_ub);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [burstSizeDefinition] Value = [0x%x] ",
+	hdd_info("Name = [burstSizeDefinition] Value = [0x%x] ",
 		  pHddCtx->config->burstSizeDefinition);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [tsInfoAckPolicy] Value = [0x%x] ",
+	hdd_info("Name = [tsInfoAckPolicy] Value = [0x%x] ",
 		  pHddCtx->config->tsInfoAckPolicy);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [rfSettlingTimeUs] Value = [%u] ",
+	hdd_info("Name = [rfSettlingTimeUs] Value = [%u] ",
 		  pHddCtx->config->rfSettlingTimeUs);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [bSingleTidRc] Value = [%u] ",
+	hdd_info("Name = [bSingleTidRc] Value = [%u] ",
 		  pHddCtx->config->bSingleTidRc);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [gDynamicPSPollvalue] Value = [%u] ",
+	hdd_info("Name = [gDynamicPSPollvalue] Value = [%u] ",
 		  pHddCtx->config->dynamicPsPollValue);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [gAddTSWhenACMIsOff] Value = [%u] ",
+	hdd_info("Name = [gAddTSWhenACMIsOff] Value = [%u] ",
 		  pHddCtx->config->AddTSWhenACMIsOff);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [gValidateScanList] Value = [%u] ",
+	hdd_info("Name = [gValidateScanList] Value = [%u] ",
 		  pHddCtx->config->fValidateScanList);
 
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [gStaKeepAlivePeriod] Value = [%u] ",
+	hdd_info("Name = [gStaKeepAlivePeriod] Value = [%u] ",
 		  pHddCtx->config->infraStaKeepAlivePeriod);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [gApDataAvailPollInterVal] Value = [%u] ",
+	hdd_info("Name = [gApDataAvailPollInterVal] Value = [%u] ",
 		  pHddCtx->config->apDataAvailPollPeriodInMs);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [BandCapability] Value = [%u] ",
+	hdd_info("Name = [BandCapability] Value = [%u] ",
 		  pHddCtx->config->nBandCapability);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [teleBcnWakeupEnable] Value = [%u] ",
+	hdd_info("Name = [teleBcnWakeupEnable] Value = [%u] ",
 		  pHddCtx->config->teleBcnWakeupEn);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [transListenInterval] Value = [%u] ",
+	hdd_info("Name = [transListenInterval] Value = [%u] ",
 		  pHddCtx->config->nTeleBcnTransListenInterval);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [transLiNumIdleBeacons] Value = [%u] ",
+	hdd_info("Name = [transLiNumIdleBeacons] Value = [%u] ",
 		  pHddCtx->config->nTeleBcnTransLiNumIdleBeacons);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [maxListenInterval] Value = [%u] ",
+	hdd_info("Name = [maxListenInterval] Value = [%u] ",
 		  pHddCtx->config->nTeleBcnMaxListenInterval);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [maxLiNumIdleBeacons] Value = [%u] ",
+	hdd_info("Name = [maxLiNumIdleBeacons] Value = [%u] ",
 		  pHddCtx->config->nTeleBcnMaxLiNumIdleBeacons);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [gApDataAvailPollInterVal] Value = [%u] ",
+	hdd_info("Name = [gApDataAvailPollInterVal] Value = [%u] ",
 		  pHddCtx->config->apDataAvailPollPeriodInMs);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [gEnableBypass11d] Value = [%u] ",
+	hdd_info("Name = [gEnableBypass11d] Value = [%u] ",
 		  pHddCtx->config->enableBypass11d);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [gEnableDFSChnlScan] Value = [%u] ",
+	hdd_info("Name = [gEnableDFSChnlScan] Value = [%u] ",
 		  pHddCtx->config->enableDFSChnlScan);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [gEnableDFSPnoChnlScan] Value = [%u] ",
+	hdd_info("Name = [gEnableDFSPnoChnlScan] Value = [%u] ",
 		  pHddCtx->config->enable_dfs_pno_chnl_scan);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [gReportMaxLinkSpeed] Value = [%u] ",
+	hdd_info("Name = [gReportMaxLinkSpeed] Value = [%u] ",
 		  pHddCtx->config->reportMaxLinkSpeed);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [thermalMitigationEnable] Value = [%u] ",
+	hdd_info("Name = [thermalMitigationEnable] Value = [%u] ",
 		  pHddCtx->config->thermalMitigationEnable);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [gVhtChannelWidth] value = [%u]",
+	hdd_info("Name = [gVhtChannelWidth] value = [%u]",
 		  pHddCtx->config->vhtChannelWidth);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [enableFirstScan2GOnly] Value = [%u] ",
+	hdd_info("Name = [enableFirstScan2GOnly] Value = [%u] ",
 		  pHddCtx->config->enableFirstScan2GOnly);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [skipDfsChnlInP2pSearch] Value = [%u] ",
+	hdd_info("Name = [skipDfsChnlInP2pSearch] Value = [%u] ",
 		  pHddCtx->config->skipDfsChnlInP2pSearch);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [ignoreDynamicDtimInP2pMode] Value = [%u] ",
+	hdd_info("Name = [ignoreDynamicDtimInP2pMode] Value = [%u] ",
 		  pHddCtx->config->ignoreDynamicDtimInP2pMode);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [enableRxSTBC] Value = [%u] ",
+	hdd_info("Name = [enableRxSTBC] Value = [%u] ",
 		  pHddCtx->config->enableRxSTBC);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [gEnableLpwrImgTransition] Value = [%u] ",
+	hdd_info("Name = [gEnableLpwrImgTransition] Value = [%u] ",
 		  pHddCtx->config->enableLpwrImgTransition);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [gEnableSSR] Value = [%u] ",
+	hdd_info("Name = [gEnableSSR] Value = [%u] ",
 		  pHddCtx->config->enableSSR);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [gEnableVhtFor24GHzBand] Value = [%u] ",
+	hdd_info("Name = [gEnableVhtFor24GHzBand] Value = [%u] ",
 		  pHddCtx->config->enableVhtFor24GHzBand);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [gEnableIbssHeartBeatOffload] Value = [%u] ",
+	hdd_info("Name = [gEnableIbssHeartBeatOffload] Value = [%u] ",
 		  pHddCtx->config->enableIbssHeartBeatOffload);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [gAntennaDiversity] Value = [%u] ",
+	hdd_info("Name = [gAntennaDiversity] Value = [%u] ",
 		  pHddCtx->config->antennaDiversity);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [gGoLinkMonitorPeriod] Value = [%u]",
+	hdd_info("Name = [gGoLinkMonitorPeriod] Value = [%u]",
 		  pHddCtx->config->goLinkMonitorPeriod);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [gApLinkMonitorPeriod] Value = [%u]",
+	hdd_info("Name = [gApLinkMonitorPeriod] Value = [%u]",
 		  pHddCtx->config->apLinkMonitorPeriod);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [gGoKeepAlivePeriod] Value = [%u]",
+	hdd_info("Name = [gGoKeepAlivePeriod] Value = [%u]",
 		  pHddCtx->config->goKeepAlivePeriod);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [gApKeepAlivePeriod]Value = [%u]",
+	hdd_info("Name = [gApKeepAlivePeriod]Value = [%u]",
 		  pHddCtx->config->apKeepAlivePeriod);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [gAmsduSupportInAMPDU] Value = [%u] ",
+	hdd_info("Name = [gAmsduSupportInAMPDU] Value = [%u] ",
 		  pHddCtx->config->isAmsduSupportInAMPDU);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [nSelect5GHzMargin] Value = [%u] ",
+	hdd_info("Name = [nSelect5GHzMargin] Value = [%u] ",
 		  pHddCtx->config->nSelect5GHzMargin);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [gCoalesingInIBSS] Value = [%u] ",
+	hdd_info("Name = [gCoalesingInIBSS] Value = [%u] ",
 		  pHddCtx->config->isCoalesingInIBSSAllowed);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [gIbssATIMWinSize] Value = [%u] ",
+	hdd_info("Name = [gIbssATIMWinSize] Value = [%u] ",
 		  pHddCtx->config->ibssATIMWinSize);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [gIbssIsPowerSaveAllowed] Value = [%u] ",
+	hdd_info("Name = [gIbssIsPowerSaveAllowed] Value = [%u] ",
 		  pHddCtx->config->isIbssPowerSaveAllowed);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [gIbssIsPowerCollapseAllowed] Value = [%u] ",
+	hdd_info("Name = [gIbssIsPowerCollapseAllowed] Value = [%u] ",
 		  pHddCtx->config->isIbssPowerCollapseAllowed);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [gIbssAwakeOnTxRx] Value = [%u] ",
+	hdd_info("Name = [gIbssAwakeOnTxRx] Value = [%u] ",
 		  pHddCtx->config->isIbssAwakeOnTxRx);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [gIbssInactivityTime] Value = [%u] ",
+	hdd_info("Name = [gIbssInactivityTime] Value = [%u] ",
 		  pHddCtx->config->ibssInactivityCount);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [gIbssTxSpEndInactivityTime] Value = [%u] ",
+	hdd_info("Name = [gIbssTxSpEndInactivityTime] Value = [%u] ",
 		  pHddCtx->config->ibssTxSpEndInactivityTime);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [gIbssPsWarmupTime] Value = [%u] ",
+	hdd_info("Name = [gIbssPsWarmupTime] Value = [%u] ",
 		  pHddCtx->config->ibssPsWarmupTime);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [gIbssPs1RxChainInAtim] Value = [%u] ",
+	hdd_info("Name = [gIbssPs1RxChainInAtim] Value = [%u] ",
 		  pHddCtx->config->ibssPs1RxChainInAtimEnable);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [fDfsPhyerrFilterOffload] Value = [%u] ",
+	hdd_info("Name = [fDfsPhyerrFilterOffload] Value = [%u] ",
 		  pHddCtx->config->fDfsPhyerrFilterOffload);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [gIgnorePeerErpInfo] Value = [%u] ",
+	hdd_info("Name = [gIgnorePeerErpInfo] Value = [%u] ",
 		  pHddCtx->config->ignore_peer_erp_info);
 #ifdef IPA_OFFLOAD
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [gIPAConfig] Value = [0x%x] ",
+	hdd_info("Name = [gIPAConfig] Value = [0x%x] ",
 		  pHddCtx->config->IpaConfig);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [gIPADescSize] Value = [%u] ",
+	hdd_info("Name = [gIPADescSize] Value = [%u] ",
 		  pHddCtx->config->IpaDescSize);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [IpaHighBandwidthMbpsg] Value = [%u] ",
+	hdd_info("Name = [IpaHighBandwidthMbpsg] Value = [%u] ",
 		  pHddCtx->config->IpaHighBandwidthMbps);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [IpaMediumBandwidthMbps] Value = [%u] ",
+	hdd_info("Name = [IpaMediumBandwidthMbps] Value = [%u] ",
 		  pHddCtx->config->IpaMediumBandwidthMbps);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [IpaLowBandwidthMbps] Value = [%u] ",
+	hdd_info("Name = [IpaLowBandwidthMbps] Value = [%u] ",
 		  pHddCtx->config->IpaLowBandwidthMbps);
 #endif
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [gEnableOverLapCh] Value = [%u] ",
+	hdd_info("Name = [gEnableOverLapCh] Value = [%u] ",
 		  pHddCtx->config->gEnableOverLapCh);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [gMaxOffloadPeers] Value = [%u] ",
+	hdd_info("Name = [gMaxOffloadPeers] Value = [%u] ",
 		  pHddCtx->config->apMaxOffloadPeers);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [gMaxOffloadReorderBuffs] value = [%u] ",
+	hdd_info("Name = [gMaxOffloadReorderBuffs] value = [%u] ",
 		  pHddCtx->config->apMaxOffloadReorderBuffs);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [gAllowDFSChannelRoam] Value = [%u] ",
+	hdd_info("Name = [gAllowDFSChannelRoam] Value = [%u] ",
 		  pHddCtx->config->allowDFSChannelRoam);
-	hddLog(QDF_TRACE_LEVEL_INFO_HIGH,
-	       "Name = [gMaxConcurrentActiveSessions] Value = [%u] ",
+	hdd_info("Name = [gMaxConcurrentActiveSessions] Value = [%u] ",
 	       pHddCtx->config->gMaxConcurrentActiveSessions);
 
 #ifdef MSM_PLATFORM
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [gBusBandwidthHighThreshold] Value = [%u] ",
+	hdd_info("Name = [gBusBandwidthHighThreshold] Value = [%u] ",
 		  pHddCtx->config->busBandwidthHighThreshold);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [gBusBandwidthMediumThreshold] Value = [%u] ",
+	hdd_info("Name = [gBusBandwidthMediumThreshold] Value = [%u] ",
 		  pHddCtx->config->busBandwidthMediumThreshold);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [gBusBandwidthLowThreshold] Value = [%u] ",
+	hdd_info("Name = [gBusBandwidthLowThreshold] Value = [%u] ",
 		  pHddCtx->config->busBandwidthLowThreshold);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [gbusBandwidthComputeInterval] Value = [%u] ",
+	hdd_info("Name = [gbusBandwidthComputeInterval] Value = [%u] ",
 		  pHddCtx->config->busBandwidthComputeInterval);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [%s] Value = [%u] ",
+	hdd_info("Name = [%s] Value = [%u] ",
 		  CFG_ENABLE_TCP_DELACK,
 		  pHddCtx->config->enable_tcp_delack);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [gTcpDelAckThresholdHigh] Value = [%u] ",
+	hdd_info("Name = [gTcpDelAckThresholdHigh] Value = [%u] ",
 		  pHddCtx->config->tcpDelackThresholdHigh);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [gTcpDelAckThresholdLow] Value = [%u] ",
+	hdd_info("Name = [gTcpDelAckThresholdLow] Value = [%u] ",
 		  pHddCtx->config->tcpDelackThresholdLow);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [%s] Value = [%u] ",
+	hdd_info("Name = [%s] Value = [%u] ",
 		  CFG_TCP_DELACK_TIMER_COUNT,
 		  pHddCtx->config->tcp_delack_timer_count);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [%s] Value = [%u] ",
+	hdd_info("Name = [%s] Value = [%u] ",
 		  CFG_TCP_TX_HIGH_TPUT_THRESHOLD_NAME,
 		  pHddCtx->config->tcp_tx_high_tput_thres);
 
 #endif
 
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [gIgnoreCAC] Value = [%u] ",
+	hdd_info("Name = [gIgnoreCAC] Value = [%u] ",
 		  pHddCtx->config->ignoreCAC);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [gSapPreferredChanLocation] Value = [%u] ",
+	hdd_info("Name = [gSapPreferredChanLocation] Value = [%u] ",
 		  pHddCtx->config->gSapPreferredChanLocation);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [gDisableDfsJapanW53] Value = [%u] ",
+	hdd_info("Name = [gDisableDfsJapanW53] Value = [%u] ",
 		  pHddCtx->config->gDisableDfsJapanW53);
 #ifdef FEATURE_GREEN_AP
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [gEnableGreenAp] Value = [%u] ",
+	hdd_info("Name = [gEnableGreenAp] Value = [%u] ",
 		  pHddCtx->config->enableGreenAP);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [gEenableEGAP] Value = [%u] ",
+	hdd_info("Name = [gEenableEGAP] Value = [%u] ",
 		  pHddCtx->config->enable_egap);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [gEGAPInactTime] Value = [%u] ",
+	hdd_info("Name = [gEGAPInactTime] Value = [%u] ",
 		  pHddCtx->config->egap_inact_time);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [gEGAPWaitTime] Value = [%u] ",
+	hdd_info("Name = [gEGAPWaitTime] Value = [%u] ",
 		  pHddCtx->config->egap_wait_time);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [gEGAPFeatures] Value = [%u] ",
+	hdd_info("Name = [gEGAPFeatures] Value = [%u] ",
 		  pHddCtx->config->egap_feature_flag);
 #endif
 #ifdef WLAN_FEATURE_ROAM_OFFLOAD
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [isRoamOffloadEnabled] Value = [%u]",
+	hdd_info("Name = [isRoamOffloadEnabled] Value = [%u]",
 		  pHddCtx->config->isRoamOffloadEnabled);
 #endif
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [gEnableSifsBurst] Value = [%u]",
+	hdd_info("Name = [gEnableSifsBurst] Value = [%u]",
 		  pHddCtx->config->enableSifsBurst);
 
 #ifdef WLAN_FEATURE_LPSS
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [gEnableLpassSupport] Value = [%u] ",
+	hdd_info("Name = [gEnableLpassSupport] Value = [%u] ",
 		  pHddCtx->config->enable_lpass_support);
 #endif
 
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [gEnableSelfRecovery] Value = [%u]",
+	hdd_info("Name = [gEnableSelfRecovery] Value = [%u]",
 		  pHddCtx->config->enableSelfRecovery);
 
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [gEnableSapSuspend] Value = [%u]",
+	hdd_info("Name = [gEnableSapSuspend] Value = [%u]",
 		  pHddCtx->config->enableSapSuspend);
 
 #ifdef WLAN_FEATURE_EXTWOW_SUPPORT
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [gExtWoWgotoSuspend] Value = [%u]",
+	hdd_info("Name = [gExtWoWgotoSuspend] Value = [%u]",
 		  pHddCtx->config->extWowGotoSuspend);
 
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [gExtWowApp1WakeupPinNumber] Value = [%u]",
+	hdd_info("Name = [gExtWowApp1WakeupPinNumber] Value = [%u]",
 		  pHddCtx->config->extWowApp1WakeupPinNumber);
 
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [gExtWowApp2WakeupPinNumber] Value = [%u]",
+	hdd_info("Name = [gExtWowApp2WakeupPinNumber] Value = [%u]",
 		  pHddCtx->config->extWowApp2WakeupPinNumber);
 
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [gExtWoWApp2KAInitPingInterval] Value = [%u]",
+	hdd_info("Name = [gExtWoWApp2KAInitPingInterval] Value = [%u]",
 		  pHddCtx->config->extWowApp2KAInitPingInterval);
 
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [gExtWoWApp2KAMinPingInterval] Value = [%u]",
+	hdd_info("Name = [gExtWoWApp2KAMinPingInterval] Value = [%u]",
 		  pHddCtx->config->extWowApp2KAMinPingInterval);
 
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [gExtWoWApp2KAMaxPingInterval] Value = [%u]",
+	hdd_info("Name = [gExtWoWApp2KAMaxPingInterval] Value = [%u]",
 		  pHddCtx->config->extWowApp2KAMaxPingInterval);
 
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [gExtWoWApp2KAIncPingInterval] Value = [%u]",
+	hdd_info("Name = [gExtWoWApp2KAIncPingInterval] Value = [%u]",
 		  pHddCtx->config->extWowApp2KAIncPingInterval);
 
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [gExtWoWApp2TcpSrcPort] Value = [%u]",
+	hdd_info("Name = [gExtWoWApp2TcpSrcPort] Value = [%u]",
 		  pHddCtx->config->extWowApp2TcpSrcPort);
 
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [gExtWoWApp2TcpDstPort] Value = [%u]",
+	hdd_info("Name = [gExtWoWApp2TcpDstPort] Value = [%u]",
 		  pHddCtx->config->extWowApp2TcpDstPort);
 
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [gExtWoWApp2TcpTxTimeout] Value = [%u]",
+	hdd_info("Name = [gExtWoWApp2TcpTxTimeout] Value = [%u]",
 		  pHddCtx->config->extWowApp2TcpTxTimeout);
 
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [gExtWoWApp2TcpRxTimeout] Value = [%u]",
+	hdd_info("Name = [gExtWoWApp2TcpRxTimeout] Value = [%u]",
 		  pHddCtx->config->extWowApp2TcpRxTimeout);
 #endif
 
 #ifdef DHCP_SERVER_OFFLOAD
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [gDHCPServerOffloadEnable] Value = [%u]",
+	hdd_info("Name = [gDHCPServerOffloadEnable] Value = [%u]",
 		  pHddCtx->config->enableDHCPServerOffload);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [gDHCPMaxNumClients] Value = [%u]",
+	hdd_info("Name = [gDHCPMaxNumClients] Value = [%u]",
 		  pHddCtx->config->dhcpMaxNumClients);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [gDHCPServerIP] Value = [%s]",
+	hdd_info("Name = [gDHCPServerIP] Value = [%s]",
 		  pHddCtx->config->dhcpServerIP);
 #endif
 
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [gEnableDumpCollect] Value = [%u]",
+	hdd_info("Name = [gEnableDumpCollect] Value = [%u]",
 			pHddCtx->config->is_ramdump_enabled);
 
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [gP2PListenDeferInterval] Value = [%u]",
+	hdd_info("Name = [gP2PListenDeferInterval] Value = [%u]",
 		  pHddCtx->config->p2p_listen_defer_interval);
 	hdd_notice("Name = [is_ps_enabled] value = [%d]",
 		   pHddCtx->config->is_ps_enabled);
@@ -5653,16 +5399,14 @@ void hdd_cfg_print(hdd_context_t *pHddCtx)
 	hdd_notice("Name = [gfine_time_meas_cap] value = [%u]",
 		  pHddCtx->config->fine_time_meas_cap);
 #ifdef WLAN_FEATURE_FASTPATH
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [fastpath_enable] Value = [%u]",
+	hdd_info("Name = [fastpath_enable] Value = [%u]",
 		  pHddCtx->config->fastpath_enable);
 #endif
 	hdd_notice("Name = [max_scan_count] value = [%d]",
 		  pHddCtx->config->max_scan_count);
 	hdd_notice("Name = [%s] value = [%d]",
 		  CFG_RX_MODE_NAME, pHddCtx->config->rx_mode);
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "Name = [%s] Value = [%u]",
+	hdd_info("Name = [%s] Value = [%u]",
 		  CFG_CE_CLASSIFY_ENABLE_NAME,
 		  pHddCtx->config->ce_classify_enabled);
 	hdd_notice("Name = [%s] value = [%u]",
@@ -5781,16 +5525,16 @@ void hdd_cfg_print(hdd_context_t *pHddCtx)
 		CFG_EDCA_BE_AIFS_VALUE_NAME,
 		pHddCtx->config->edca_be_aifs);
 
-	hddLog(LOG2, "Name = [%s] Value = [%s]",
+	hdd_info("Name = [%s] Value = [%s]",
 		CFG_ENABLE_TX_SCHED_WRR_VO,
 		pHddCtx->config->tx_sched_wrr_vo);
-	hddLog(LOG2, "Name = [%s] Value = [%s]",
+	hdd_info("Name = [%s] Value = [%s]",
 		CFG_ENABLE_TX_SCHED_WRR_VI,
 		pHddCtx->config->tx_sched_wrr_vi);
-	hddLog(LOG2, "Name = [%s] Value = [%s]",
+	hdd_info("Name = [%s] Value = [%s]",
 		CFG_ENABLE_TX_SCHED_WRR_BK,
 		pHddCtx->config->tx_sched_wrr_bk);
-	hddLog(LOG2, "Name = [%s] Value = [%s]",
+	hdd_info("Name = [%s] Value = [%s]",
 		CFG_ENABLE_TX_SCHED_WRR_BE,
 		pHddCtx->config->tx_sched_wrr_be);
 
@@ -5877,13 +5621,12 @@ QDF_STATUS hdd_update_mac_config(hdd_context_t *pHddCtx)
 	status = request_firmware(&fw, WLAN_MAC_FILE, pHddCtx->parent_dev);
 
 	if (status) {
-		hddLog(QDF_TRACE_LEVEL_WARN, "%s: request_firmware failed %d",
-		       __func__, status);
+		hdd_warn("request_firmware failed %d", status);
 		qdf_status = QDF_STATUS_E_FAILURE;
 		return qdf_status;
 	}
 	if (!fw || !fw->data || !fw->size) {
-		hddLog(QDF_TRACE_LEVEL_FATAL, "%s: invalid firmware", __func__);
+		hdd_alert("invalid firmware");
 		qdf_status = QDF_STATUS_E_INVAL;
 		goto config_exit;
 	}
@@ -5935,12 +5678,9 @@ QDF_STATUS hdd_update_mac_config(hdd_context_t *pHddCtx)
 		buffer = line;
 	}
 	if (i <= QDF_MAX_CONCURRENCY_PERSONA) {
-		hddLog(QDF_TRACE_LEVEL_INFO, "%s: %d Mac addresses provided",
-		       __func__, i);
+		hdd_notice("%d Mac addresses provided", i);
 	} else {
-		hddLog(QDF_TRACE_LEVEL_ERROR,
-		       "%s: invalid number of Mac address provided, nMac = %d",
-		       __func__, i);
+		hdd_err("invalid number of Mac address provided, nMac = %d", i);
 		qdf_status = QDF_STATUS_E_INVAL;
 		goto config_exit;
 	}
@@ -6069,24 +5809,22 @@ QDF_STATUS hdd_parse_config_ini(hdd_context_t *pHddCtx)
 	status = request_firmware(&fw, WLAN_INI_FILE, pHddCtx->parent_dev);
 
 	if (status) {
-		hddLog(QDF_TRACE_LEVEL_FATAL, "%s: request_firmware failed %d",
-		       __func__, status);
+		hdd_alert("request_firmware failed %d", status);
 		qdf_status = QDF_STATUS_E_FAILURE;
 		goto config_exit;
 	}
 	if (!fw || !fw->data || !fw->size) {
-		hddLog(QDF_TRACE_LEVEL_FATAL, "%s: %s download failed",
-		       __func__, WLAN_INI_FILE);
+		hdd_alert("%s download failed", WLAN_INI_FILE);
 		qdf_status = QDF_STATUS_E_FAILURE;
 		goto config_exit;
 	}
 
-	hddLog(LOG1, "%s: qcom_cfg.ini Size %zu", __func__, fw->size);
+	hdd_notice("qcom_cfg.ini Size %zu", fw->size);
 
 	buffer = (char *)qdf_mem_malloc(fw->size);
 
 	if (NULL == buffer) {
-		hddLog(QDF_TRACE_LEVEL_FATAL, FL("qdf_mem_malloc failure"));
+		hdd_alert("qdf_mem_malloc failure");
 		release_firmware(fw);
 		return QDF_STATUS_E_NOMEM;
 	}
@@ -6099,7 +5837,7 @@ QDF_STATUS hdd_parse_config_ini(hdd_context_t *pHddCtx)
 		line = get_next_line(buffer);
 		buffer = i_trim(buffer);
 
-		hddLog(LOG1, "%s: item", buffer);
+		hdd_notice("%s: item", buffer);
 
 		if (strlen((char *)buffer) == 0 || *buffer == '#') {
 			buffer = line;
@@ -6124,9 +5862,7 @@ QDF_STATUS hdd_parse_config_ini(hdd_context_t *pHddCtx)
 						cfgIniTable[i].name = name;
 						cfgIniTable[i++].value = value;
 						if (i >= MAX_CFG_INI_ITEMS) {
-							hddLog(LOGE,
-							       "%s: Number of items in %s > %d",
-							       __func__,
+							hdd_err("Number of items in %s > %d",
 							       WLAN_INI_FILE,
 							       MAX_CFG_INI_ITEMS);
 							break;
@@ -6200,12 +5936,12 @@ QDF_STATUS hdd_set_idle_ps_config(hdd_context_t *pHddCtx, uint32_t val)
 {
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 
-	hddLog(LOG1, "hdd_set_idle_ps_config: Enter Val %d", val);
+	hdd_notice("hdd_set_idle_ps_config: Enter Val %d", val);
 
 	status = sme_set_idle_powersave_config(pHddCtx->pcds_context,
 			pHddCtx->hHal, val);
 	if (QDF_STATUS_SUCCESS != status)
-		hddLog(LOGE, "Fail to Set Idle PS Config val %d", val);
+		hdd_err("Fail to Set Idle PS Config val %d", val);
 	return status;
 }
 
@@ -6230,7 +5966,7 @@ static void hdd_set_fine_time_meas_cap(hdd_context_t *hdd_ctx,
 	capability &= CFG_FINE_TIME_MEAS_CAPABILITY_MAX;
 	sme_config->csrConfig.fine_time_meas_cap = capability;
 
-	hddLog(LOG1, FL("fine time meas capability - INI: %04x Enabled: %04x"),
+	hdd_notice("fine time meas capability - INI: %04x Enabled: %04x",
 		config->fine_time_meas_cap,
 		sme_config->csrConfig.fine_time_meas_cap);
 
@@ -7004,13 +6740,11 @@ QDF_STATUS hdd_set_sme_config(hdd_context_t *pHddCtx)
 
 	smeConfig = qdf_mem_malloc(sizeof(*smeConfig));
 	if (NULL == smeConfig) {
-		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
-			  "%s: unable to allocate smeConfig", __func__);
+		hdd_err("unable to allocate smeConfig");
 		return QDF_STATUS_E_NOMEM;
 	}
 
-	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "%s bWmmIsEnabled=%d 802_11e_enabled=%d dot11Mode=%d",
+	hdd_info("%s bWmmIsEnabled=%d 802_11e_enabled=%d dot11Mode=%d",
 		  __func__, pConfig->WmmMode, pConfig->b80211eIsEnabled,
 		  pConfig->dot11Mode);
 
@@ -7357,7 +7091,7 @@ QDF_STATUS hdd_set_sme_config(hdd_context_t *pHddCtx)
 
 	status = sme_update_config(pHddCtx->hHal, smeConfig);
 	if (!QDF_IS_STATUS_SUCCESS(status)) {
-		hddLog(LOGE, "sme_update_config() return failure %d",
+		hdd_err("sme_update_config() return failure %d",
 		       status);
 	}
 
@@ -7408,7 +7142,7 @@ QDF_STATUS hdd_cfg_get_global_config(hdd_context_t *pHddCtx, char *pBuf,
 bool hdd_is_okc_mode_enabled(hdd_context_t *pHddCtx)
 {
 	if (NULL == pHddCtx) {
-		hddLog(QDF_TRACE_LEVEL_FATAL, "%s: pHddCtx is NULL", __func__);
+		hdd_alert("pHddCtx is NULL");
 		return -EINVAL;
 	}
 	return pHddCtx->config->isOkcIniFeatureEnabled;
@@ -7441,19 +7175,19 @@ QDF_STATUS hdd_update_nss(hdd_context_t *hdd_ctx, uint8_t nss)
 	uint8_t enable2x2;
 
 	if ((nss == 2) && (hdd_ctx->num_rf_chains != 2)) {
-		hddLog(LOGE, "No support for 2 spatial streams");
+		hdd_err("No support for 2 spatial streams");
 		return QDF_STATUS_E_INVAL;
 	}
 
 	enable2x2 = (nss == 1) ? 0 : 1;
 
 	if (hdd_config->enable2x2 == enable2x2) {
-		hddLog(LOGE, "NSS same as requested");
+		hdd_err("NSS same as requested");
 		return QDF_STATUS_SUCCESS;
 	}
 
 	if (true == sme_is_any_session_in_connected_state(hdd_ctx->hHal)) {
-		hddLog(LOGE, "Connected sessions present, Do not change NSS");
+		hdd_err("Connected sessions present, Do not change NSS");
 		return QDF_STATUS_E_INVAL;
 	}
 
@@ -7474,8 +7208,7 @@ QDF_STATUS hdd_update_nss(hdd_context_t *hdd_ctx, uint8_t nss)
 			    WNI_CFG_VHT_RX_HIGHEST_SUPPORTED_DATA_RATE,
 			    rx_supp_data_rate) == QDF_STATUS_E_FAILURE) {
 		status = false;
-		hddLog(LOGE,
-			"Could not pass on WNI_CFG_VHT_RX_HIGHEST_SUPPORTED_DATA_RATE to CFG");
+		hdd_err("Could not pass on WNI_CFG_VHT_RX_HIGHEST_SUPPORTED_DATA_RATE to CFG");
 	}
 
 	/* Update Tx Highest Long GI data Rate */
@@ -7483,8 +7216,7 @@ QDF_STATUS hdd_update_nss(hdd_context_t *hdd_ctx, uint8_t nss)
 			    WNI_CFG_VHT_TX_HIGHEST_SUPPORTED_DATA_RATE,
 			    tx_supp_data_rate) == QDF_STATUS_E_FAILURE) {
 		status = false;
-		hddLog(LOGE,
-			"Could not pass on WNI_CFG_VHT_TX_HIGHEST_SUPPORTED_DATA_RATE to CFG");
+		hdd_err("Could not pass on WNI_CFG_VHT_TX_HIGHEST_SUPPORTED_DATA_RATE to CFG");
 	}
 
 	sme_cfg_get_int(hdd_ctx->hHal, WNI_CFG_HT_CAP_INFO, &temp);
@@ -7494,14 +7226,14 @@ QDF_STATUS hdd_update_nss(hdd_context_t *hdd_ctx, uint8_t nss)
 		ht_cap_info->txSTBC = 0;
 	} else {
 		sme_cfg_get_int(hdd_ctx->hHal, WNI_CFG_VHT_TXSTBC, &val32);
-		hddLog(LOG1, FL("STBC %d"), val32);
+		hdd_notice("STBC %d", val32);
 		ht_cap_info->txSTBC = val32;
 	}
 	temp = val16;
 	if (sme_cfg_set_int(hdd_ctx->hHal, WNI_CFG_HT_CAP_INFO,
 			    temp) == QDF_STATUS_E_FAILURE) {
 		status = false;
-		hddLog(LOGE, "Could not pass on WNI_CFG_HT_CAP_INFO to CFG");
+		hdd_err("Could not pass on WNI_CFG_HT_CAP_INFO to CFG");
 	}
 
 	sme_cfg_get_int(hdd_ctx->hHal, WNI_CFG_VHT_BASIC_MCS_SET, &temp);
@@ -7514,8 +7246,7 @@ QDF_STATUS hdd_update_nss(hdd_context_t *hdd_ctx, uint8_t nss)
 	if (sme_cfg_set_int(hdd_ctx->hHal, WNI_CFG_VHT_BASIC_MCS_SET,
 			    temp) == QDF_STATUS_E_FAILURE) {
 		status = false;
-		hddLog(LOGE,
-			"Could not pass on WNI_CFG_VHT_BASIC_MCS_SET to CFG");
+		hdd_err("Could not pass on WNI_CFG_VHT_BASIC_MCS_SET to CFG");
 	}
 
 	sme_cfg_get_int(hdd_ctx->hHal, WNI_CFG_VHT_RX_MCS_MAP, &temp);
@@ -7528,7 +7259,7 @@ QDF_STATUS hdd_update_nss(hdd_context_t *hdd_ctx, uint8_t nss)
 	if (sme_cfg_set_int(hdd_ctx->hHal, WNI_CFG_VHT_RX_MCS_MAP,
 			    temp) == QDF_STATUS_E_FAILURE) {
 		status = false;
-		hddLog(LOGE, "Could not pass on WNI_CFG_VHT_RX_MCS_MAP to CFG");
+		hdd_err("Could not pass on WNI_CFG_VHT_RX_MCS_MAP to CFG");
 	}
 
 	sme_cfg_get_int(hdd_ctx->hHal, WNI_CFG_VHT_TX_MCS_MAP, &temp);
@@ -7541,7 +7272,7 @@ QDF_STATUS hdd_update_nss(hdd_context_t *hdd_ctx, uint8_t nss)
 	if (sme_cfg_set_int(hdd_ctx->hHal, WNI_CFG_VHT_TX_MCS_MAP,
 			    temp) == QDF_STATUS_E_FAILURE) {
 		status = false;
-		hddLog(LOGE, "Could not pass on WNI_CFG_VHT_TX_MCS_MAP to CFG");
+		hdd_err("Could not pass on WNI_CFG_VHT_TX_MCS_MAP to CFG");
 	}
 
 #define WLAN_HDD_RX_MCS_ALL_NSTREAM_RATES 0xff
@@ -7559,7 +7290,7 @@ QDF_STATUS hdd_update_nss(hdd_context_t *hdd_ctx, uint8_t nss)
 			    SIZE_OF_SUPPORTED_MCS_SET) ==
 				QDF_STATUS_E_FAILURE) {
 		status = false;
-		hddLog(LOGE, "Could not pass on MCS SET to CFG");
+		hdd_err("Could not pass on MCS SET to CFG");
 	}
 #undef WLAN_HDD_RX_MCS_ALL_NSTREAM_RATES