qcacld-3.0: Reduce the log spam in wlan_hdd_hostapd.c

Move the logs to appropriate log levels to reduce
the log spam in wlan_hdd_hostapd.c

Change-Id: I5d923e5ada1a9acf22c8fdecf3e1b2416a10745c
CRs-Fixed: 2014745

1 files changed, 234 insertions, 237 deletions

diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c
index 6ac218253bf3..99d60f8f07a6 100644
--- a/core/hdd/src/wlan_hdd_hostapd.c
+++ b/core/hdd/src/wlan_hdd_hostapd.c
@@ -138,7 +138,7 @@ static void hdd_hostapd_channel_allow_suspend(hdd_adapter_t *pAdapter,
 	hdd_hostapd_state_t *pHostapdState =
 		WLAN_HDD_GET_HOSTAP_STATE_PTR(pAdapter);
 
-	hdd_notice("bssState: %d, channel: %d, dfs_ref_cnt: %d",
+	hdd_debug("bssState: %d, channel: %d, dfs_ref_cnt: %d",
 	       pHostapdState->bssState, channel,
 	       atomic_read(&pHddCtx->sap_dfs_ref_cnt));
 
@@ -151,7 +151,7 @@ static void hdd_hostapd_channel_allow_suspend(hdd_adapter_t *pAdapter,
 
 	/* Release wakelock when no more DFS channels are used */
 	if (atomic_dec_and_test(&pHddCtx->sap_dfs_ref_cnt)) {
-		hdd_err("DFS: allowing suspend (chan %d)", channel);
+		hdd_err("DFS: allowing suspend (chan: %d)", channel);
 		qdf_wake_lock_release(&pHddCtx->sap_dfs_wakelock,
 				      WIFI_POWER_EVENT_WAKELOCK_DFS);
 		qdf_runtime_pm_allow_suspend(&pHddCtx->runtime_context.dfs);
@@ -175,7 +175,7 @@ static void hdd_hostapd_channel_prevent_suspend(hdd_adapter_t *pAdapter,
 	hdd_hostapd_state_t *pHostapdState =
 		WLAN_HDD_GET_HOSTAP_STATE_PTR(pAdapter);
 
-	hdd_notice("bssState: %d, channel: %d, dfs_ref_cnt: %d",
+	hdd_debug("bssState: %d, channel: %d, dfs_ref_cnt: %d",
 	       pHostapdState->bssState, channel,
 	       atomic_read(&pHddCtx->sap_dfs_ref_cnt));
 
@@ -189,7 +189,7 @@ static void hdd_hostapd_channel_prevent_suspend(hdd_adapter_t *pAdapter,
 
 	/* Acquire wakelock if we have at least one DFS channel in use */
 	if (atomic_inc_return(&pHddCtx->sap_dfs_ref_cnt) == 1) {
-		hdd_err("DFS: preventing suspend (chan %d)", channel);
+		hdd_err("DFS: preventing suspend (chan: %d)", channel);
 		qdf_runtime_pm_prevent_suspend(&pHddCtx->runtime_context.dfs);
 		qdf_wake_lock_acquire(&pHddCtx->sap_dfs_wakelock,
 				      WIFI_POWER_EVENT_WAKELOCK_DFS);
@@ -212,7 +212,7 @@ void hdd_sap_context_destroy(hdd_context_t *hdd_ctx)
 				      WIFI_POWER_EVENT_WAKELOCK_DRIVER_EXIT);
 
 		atomic_set(&hdd_ctx->sap_dfs_ref_cnt, 0);
-		hdd_warn("DFS: Allowing suspend");
+		hdd_debug("DFS: Allowing suspend");
 	}
 
 	qdf_wake_lock_destroy(&hdd_ctx->sap_dfs_wakelock);
@@ -311,7 +311,7 @@ static int __hdd_hostapd_stop(struct net_device *dev)
 		return ret;
 
 	if (!sap_ctx) {
-		hdd_err("invalid sap ctx : %p", sap_ctx);
+		hdd_err("invalid sap ctx: %p", sap_ctx);
 		return -ENODEV;
 	}
 
@@ -434,7 +434,7 @@ QDF_STATUS hdd_set_sap_ht2040_mode(hdd_adapter_t *pHostapdAdapter,
 	QDF_STATUS qdf_ret_status = QDF_STATUS_E_FAILURE;
 	void *hHal = NULL;
 
-	hdd_err("change HT20/40 mode");
+	hdd_debug("change HT20/40 mode");
 
 	if (QDF_SAP_MODE == pHostapdAdapter->device_mode) {
 		hHal = WLAN_HDD_GET_HAL_CTX(pHostapdAdapter);
@@ -567,7 +567,7 @@ static void hdd_hostapd_inactivity_timer_cb(void *context)
 	memset(&wrqu, 0, sizeof(wrqu));
 	wrqu.data.length = event_len;
 
-	hdd_notice("Shutting down AP interface due to inactivity");
+	hdd_debug("Shutting down AP interface due to inactivity");
 	wireless_send_event(dev, IWEVCUSTOM, &wrqu, (char *)we_custom_event);
 
 	EXIT();
@@ -581,7 +581,7 @@ static void hdd_clear_all_sta(hdd_adapter_t *pHostapdAdapter,
 	struct tagCsrDelStaParams del_sta_params;
 	dev = (struct net_device *)usrDataForCallback;
 
-	hdd_err("Clearing all the STA entry....");
+	hdd_debug("Clearing all the STA entry....");
 	for (staId = 0; staId < WLAN_MAX_STA_COUNT; staId++) {
 		if (pHostapdAdapter->aStaInfo[staId].isUsed &&
 		    (staId !=
@@ -617,7 +617,7 @@ static int hdd_stop_bss_link(hdd_adapter_t *pHostapdAdapter,
 		status = wlansap_stop_bss(
 			WLAN_HDD_GET_SAP_CTX_PTR(pHostapdAdapter));
 		if (QDF_IS_STATUS_SUCCESS(status))
-			hdd_err("Deleting SAP/P2P link!!!!!!");
+			hdd_debug("Deleting SAP/P2P link!!!!!!");
 
 		clear_bit(SOFTAP_BSS_STARTED, &pHostapdAdapter->event_flags);
 		cds_decr_session_set_pcl(pHostapdAdapter->device_mode,
@@ -692,7 +692,7 @@ QDF_STATUS hdd_chan_change_notify(hdd_adapter_t *adapter,
 		return QDF_STATUS_E_FAILURE;
 	}
 
-	hdd_info("chan:%d width:%d sec_ch_offset:%d seg0:%d seg1:%d",
+	hdd_debug("chan:%d width:%d sec_ch_offset:%d seg0:%d seg1:%d",
 		chan_change.chan, chan_change.chan_params.ch_width,
 		chan_change.chan_params.sec_ch_offset,
 		chan_change.chan_params.center_freq_seg0,
@@ -747,7 +747,7 @@ QDF_STATUS hdd_chan_change_notify(hdd_adapter_t *adapter,
 				chan_change.chan_params.center_freq_seg1);
 	}
 
-	hdd_info("notify: chan:%d width:%d freq1:%d freq2:%d",
+	hdd_debug("notify: chan:%d width:%d freq1:%d freq2:%d",
 		chandef.chan->center_freq, chandef.width, chandef.center_freq1,
 		chandef.center_freq2);
 
@@ -1044,9 +1044,9 @@ static QDF_STATUS hdd_handle_acs_scan_event(tpSap_Event sap_event,
 	 * scan result.
 	 */
 	if (wlan_hdd_cfg80211_update_bss(hdd_ctx->wiphy, adapter, 0))
-		hdd_info("NO SCAN result");
+		hdd_debug("NO SCAN result");
 
-	hdd_info("Reusing Last ACS scan result for %d sec",
+	hdd_debug("Reusing Last ACS scan result for %d sec",
 		ACS_SCAN_EXPIRY_TIMEOUT_S);
 	qdf_mc_timer_stop(&hdd_ctx->skip_acs_scan_timer);
 	qdf_status = qdf_mc_timer_start(&hdd_ctx->skip_acs_scan_timer,
@@ -1139,7 +1139,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
 
 	switch (sapEvent) {
 	case eSAP_START_BSS_EVENT:
-		hdd_notice("BSS status = %s, channel = %u, bc sta Id = %d",
+		hdd_debug("BSS status = %s, channel = %u, bc sta Id = %d",
 		       pSapEvent->sapevt.sapStartBssCompleteEvent.
 		       status ? "eSAP_STATUS_FAILURE" : "eSAP_STATUS_SUCCESS",
 		       pSapEvent->sapevt.sapStartBssCompleteEvent.
@@ -1152,7 +1152,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
 		pHostapdState->qdf_status =
 			pSapEvent->sapevt.sapStartBssCompleteEvent.status;
 		if (pHostapdState->qdf_status) {
-			hdd_err("ERROR: startbss event failed!!");
+			hdd_err("startbss event failed!!");
 			/*
 			 * Make sure to set the event before proceeding
 			 * for error handling otherwise caller thread will
@@ -1264,7 +1264,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
 						(pHostapdAdapter),
 					&pHddApCtx->wepKey[i]);
 				if (!QDF_IS_STATUS_SUCCESS(status)) {
-					hdd_err("set_key failed idx %d", i);
+					hdd_err("set_key failed idx: %d", i);
 				}
 			}
 		}
@@ -1282,7 +1282,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
 		else
 			pHddApCtx->dfs_cac_block_tx = true;
 
-		hdd_info("The value of dfs_cac_block_tx[%d] for ApCtx[%p]:%d",
+		hdd_debug("The value of dfs_cac_block_tx[%d] for ApCtx[%p]:%d",
 				pHddApCtx->dfs_cac_block_tx, pHddApCtx,
 				pHostapdAdapter->sessionId);
 
@@ -1290,13 +1290,13 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
 		     cds_get_channel_state(pHddApCtx->operatingChannel))
 		    && (pHddCtx->config->IsSapDfsChSifsBurstEnabled == 0)) {
 
-			hdd_notice("Set SIFS Burst disable for DFS channel %d",
+			hdd_debug("Set SIFS Burst disable for DFS channel %d",
 			       pHddApCtx->operatingChannel);
 
 			if (wma_cli_set_command(pHostapdAdapter->sessionId,
 						WMI_PDEV_PARAM_BURST_ENABLE,
 						0, PDEV_CMD)) {
-				hdd_err("Failed to Set SIFS Burst %d",
+				hdd_err("Failed to Set SIFS Burst channel: %d",
 				       pHddApCtx->operatingChannel);
 			}
 		}
@@ -1315,11 +1315,11 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
 		hdd_ipa_send_mcc_scc_msg(pHddCtx, pHddCtx->mcc_mode);
 
 		if (cds_is_hw_mode_change_after_vdev_up()) {
-			hdd_info("check for possible hw mode change");
+			hdd_debug("check for possible hw mode change");
 			status = cds_set_hw_mode_on_channel_switch(
 					pHostapdAdapter->sessionId);
 			if (QDF_IS_STATUS_ERROR(status))
-				hdd_info("set hw mode change not done");
+				hdd_debug("set hw mode change not done");
 			cds_set_do_hw_mode_change_flag(false);
 		}
 		/*
@@ -1330,13 +1330,13 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
 		 */
 		qdf_status = qdf_event_set(&pHostapdState->qdf_event);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-			hdd_err("ERROR: startbss event set failed!!");
+			hdd_err("qdf_event_set failed! status: %d", qdf_status);
 			goto stopbss;
 		}
 		break;          /* Event will be sent after Switch-Case stmt */
 
 	case eSAP_STOP_BSS_EVENT:
-		hdd_notice("BSS stop status = %s",
+		hdd_debug("BSS stop status = %s",
 		       pSapEvent->sapevt.sapStopBssCompleteEvent.
 		       status ? "eSAP_STATUS_FAILURE" : "eSAP_STATUS_SUCCESS");
 
@@ -1373,11 +1373,11 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
 			(QDF_P2P_GO_MODE == pHostapdAdapter->device_mode)) {
 			hdd_adapter_t *sta_adapter = hdd_get_adapter(pHddCtx,
 					QDF_STA_MODE);
-			hdd_info("P2PGO is going down now");
+			hdd_debug("P2PGO is going down now");
 			hdd_issue_stored_joinreq(sta_adapter, pHddCtx);
 		}
 
-		hdd_info("bss_stop_reason=%d", pHddApCtx->bss_stop_reason);
+		hdd_debug("bss_stop_reason=%d", pHddApCtx->bss_stop_reason);
 		if (pHddApCtx->bss_stop_reason !=
 			BSS_STOP_DUE_TO_MCC_SCC_SWITCH) {
 			/* when MCC to SCC switching happens, key storage
@@ -1406,7 +1406,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
 				dfs_info, &pHostapdAdapter->wdev)) {
 			hdd_err("Unable to indicate CAC start NL event");
 		} else {
-			hdd_info("Sent CAC start to user space");
+			hdd_debug("Sent CAC start to user space");
 		}
 
 		qdf_atomic_set(&pHddCtx->dfs_radar_found, 0);
@@ -1425,7 +1425,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
 				dfs_info, &pHostapdAdapter->wdev)) {
 			hdd_err("Unable to indicate CAC end (interrupted) event");
 		} else {
-			hdd_info("Sent CAC end (interrupted) to user space");
+			hdd_debug("Sent CAC end (interrupted) to user space");
 		}
 		break;
 	case eSAP_DFS_CAC_END:
@@ -1440,7 +1440,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
 				dfs_info, &pHostapdAdapter->wdev)) {
 			hdd_err("Unable to indicate CAC end NL event");
 		} else {
-			hdd_info("Sent CAC end to user space");
+			hdd_debug("Sent CAC end to user space");
 		}
 		break;
 	case eSAP_DFS_RADAR_DETECT:
@@ -1454,7 +1454,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
 				dfs_info, &pHostapdAdapter->wdev)) {
 			hdd_err("Unable to indicate Radar detect NL event");
 		} else {
-			hdd_info("Sent radar detected to user space");
+			hdd_debug("Sent radar detected to user space");
 		}
 		break;
 	case eSAP_DFS_RADAR_DETECT_DURING_PRE_CAC:
@@ -1493,7 +1493,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
 		 * forward the message to hostapd once implementation
 		 * is done for now just print
 		 */
-		hdd_notice("SET Key: configured status = %s",
+		hdd_debug("SET Key: configured status = %s",
 		       pSapEvent->sapevt.sapStationSetKeyCompleteEvent.
 		       status ? "eSAP_STATUS_FAILURE" : "eSAP_STATUS_SUCCESS");
 		return QDF_STATUS_SUCCESS;
@@ -1504,7 +1504,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
 		memcpy(msg.src_addr.sa_data,
 		       &pSapEvent->sapevt.sapStationMICFailureEvent.
 		       staMac, QDF_MAC_ADDR_SIZE);
-		hdd_notice("MIC MAC " MAC_ADDRESS_STR,
+		hdd_debug("MIC MAC " MAC_ADDRESS_STR,
 		       MAC_ADDR_ARRAY(msg.src_addr.sa_data));
 		if (pSapEvent->sapevt.sapStationMICFailureEvent.
 		    multicast == eSAP_TRUE)
@@ -1570,7 +1570,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
 						sapStationAssocReassocCompleteEvent.
 						wmmEnabled);
 			if (!QDF_IS_STATUS_SUCCESS(qdf_status))
-				hdd_warn("Failed to register STA %d "
+				hdd_err("Failed to register STA %d "
 					  MAC_ADDRESS_STR "", qdf_status,
 				       MAC_ADDR_ARRAY(wrqu.addr.sa_data));
 		} else {
@@ -1587,7 +1587,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
 						sapStationAssocReassocCompleteEvent.
 						wmmEnabled);
 			if (!QDF_IS_STATUS_SUCCESS(qdf_status))
-				hdd_warn("Failed to register STA %d "
+				hdd_err("Failed to register STA %d "
 					  MAC_ADDRESS_STR "", qdf_status,
 				       MAC_ADDR_ARRAY(wrqu.addr.sa_data));
 		}
@@ -1726,7 +1726,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
 
 		qdf_status = qdf_event_set(&pHostapdState->qdf_sta_disassoc_event);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status))
-			hdd_err("ERR: Station Deauth event Set failed");
+			hdd_err("Station Deauth event Set failed");
 
 		if (pSapEvent->sapevt.sapStationDisassocCompleteEvent.reason ==
 		    eSAP_USR_INITATED_DISASSOC)
@@ -1740,7 +1740,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
 					      sapStationDisassocCompleteEvent.staMac,
 					      &staId);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-			hdd_err("ERROR: HDD Failed to find sta id!!");
+			hdd_err("Failed to find sta id! status: %d", qdf_status);
 			return QDF_STATUS_E_FAILURE;
 		}
 #ifdef IPA_OFFLOAD
@@ -1753,7 +1753,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
 					staMac.bytes);
 
 			if (status) {
-				hdd_err("ERROR: WLAN_CLIENT_DISCONNECT event failed!!");
+				hdd_err("WLAN_CLIENT_DISCONNECT event failed!!");
 				goto stopbss;
 			}
 		}
@@ -1814,7 +1814,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
 		/* Update the beacon Interval if it is P2P GO */
 		qdf_status = cds_change_mcc_go_beacon_interval(pHostapdAdapter);
 		if (QDF_STATUS_SUCCESS != qdf_status) {
-			hdd_err("failed to update Beacon interval %d",
+			hdd_err("Failed to update Beacon interval status: %d",
 				qdf_status);
 		}
 		if (pHostapdAdapter->device_mode == QDF_P2P_GO_MODE) {
@@ -1861,7 +1861,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
 		qdf_copy_macaddr(&pHddApCtx->WPSPBCProbeReq.peer_macaddr,
 			     &pSapEvent->sapevt.sapPBCProbeReqEvent.
 			     WPSPBCProbeReq.peer_macaddr);
-		hdd_notice("WPS PBC probe req " MAC_ADDRESS_STR,
+		hdd_debug("WPS PBC probe req " MAC_ADDRESS_STR,
 		       MAC_ADDR_ARRAY(pHddApCtx->WPSPBCProbeReq.
 				      peer_macaddr.bytes));
 		memset(&wreq, 0, sizeof(wreq));
@@ -1927,13 +1927,13 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
 		wrqu.data.pointer = maxAssocExceededEvent;
 		wrqu.data.length = strlen(maxAssocExceededEvent);
 		we_custom_event_generic = (uint8_t *) maxAssocExceededEvent;
-		hdd_notice("%s", maxAssocExceededEvent);
+		hdd_debug("%s", maxAssocExceededEvent);
 		break;
 	case eSAP_STA_ASSOC_IND:
 		return QDF_STATUS_SUCCESS;
 
 	case eSAP_DISCONNECT_ALL_P2P_CLIENT:
-		hdd_notice(" Disconnecting all the P2P Clients....");
+		hdd_debug(" Disconnecting all the P2P Clients....");
 		hdd_clear_all_sta(pHostapdAdapter, usrDataForCallback);
 		return QDF_STATUS_SUCCESS;
 
@@ -1947,7 +1947,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
 		return QDF_STATUS_SUCCESS;
 
 	case eSAP_CHANNEL_CHANGE_EVENT:
-		hdd_notice("Received eSAP_CHANNEL_CHANGE_EVENT event");
+		hdd_debug("Received eSAP_CHANNEL_CHANGE_EVENT event");
 		if (pHostapdState->bssState != BSS_STOP) {
 			/* Prevent suspend for new channel */
 			hdd_hostapd_channel_prevent_suspend(pHostapdAdapter,
@@ -2000,7 +2000,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
 	case eSAP_ACS_SCAN_SUCCESS_EVENT:
 		return hdd_handle_acs_scan_event(pSapEvent, pHostapdAdapter);
 	case eSAP_DFS_NOL_GET:
-		hdd_notice("Received eSAP_DFS_NOL_GET event");
+		hdd_debug("Received eSAP_DFS_NOL_GET event");
 
 		/* get the dfs nol from PLD */
 		ret = pld_wlan_get_dfs_nol(pHddCtx->parent_dev,
@@ -2010,14 +2010,14 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
 					   sDfsList);
 
 		if (ret > 0) {
-			hdd_info("Get %d bytes of dfs nol from PLD", ret);
+			hdd_debug("Get %d bytes of dfs nol from PLD", ret);
 			return QDF_STATUS_SUCCESS;
 		} else {
-			hdd_info("No dfs nol entry in PLD, ret: %d", ret);
+			hdd_debug("No dfs nol entry in PLD, ret: %d", ret);
 			return QDF_STATUS_E_FAULT;
 		}
 	case eSAP_DFS_NOL_SET:
-		hdd_notice("Received eSAP_DFS_NOL_SET event");
+		hdd_debug("Received eSAP_DFS_NOL_SET event");
 
 		/* set the dfs nol to PLD */
 		ret = pld_wlan_set_dfs_nol(pHddCtx->parent_dev,
@@ -2027,14 +2027,14 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
 					   sDfsList);
 
 		if (ret) {
-			hdd_info("Failed to set dfs nol - ret: %d", ret);
+			hdd_debug("Failed to set dfs nol - ret: %d", ret);
 		} else {
-			hdd_info(" Set %d bytes dfs nol to PLD",
+			hdd_debug(" Set %d bytes dfs nol to PLD",
 				 pSapEvent->sapevt.sapDfsNolInfo.sDfsList);
 		}
 		return QDF_STATUS_SUCCESS;
 	case eSAP_ACS_CHANNEL_SELECTED:
-		hdd_notice("ACS Completed for wlan%d",
+		hdd_debug("ACS Completed for wlan%d",
 					pHostapdAdapter->dev->ifindex);
 		clear_bit(ACS_PENDING, &pHostapdAdapter->event_flags);
 		clear_bit(ACS_IN_PROGRESS, &pHddCtx->g_event_flags);
@@ -2053,7 +2053,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
 			wlan_hdd_cfg80211_acs_ch_select_evt(pHostapdAdapter);
 		return QDF_STATUS_SUCCESS;
 	case eSAP_ECSA_CHANGE_CHAN_IND:
-		hdd_notice("Channel change indication from peer for channel %d",
+		hdd_debug("Channel change indication from peer for channel %d",
 				pSapEvent->sapevt.sap_chan_cng_ind.new_chan);
 		if (hdd_softap_set_channel_change(dev,
 			 pSapEvent->sapevt.sap_chan_cng_ind.new_chan,
@@ -2063,7 +2063,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
 			return QDF_STATUS_SUCCESS;
 
 	default:
-		hdd_notice("SAP message is not handled");
+		hdd_debug("SAP message is not handled");
 		goto stopbss;
 		return QDF_STATUS_SUCCESS;
 	}
@@ -2078,7 +2078,7 @@ stopbss:
 		char *stopBssEvent = "STOP-BSS.response";       /* 17 */
 		int event_len = strlen(stopBssEvent);
 
-		hdd_notice("BSS stop status = %s",
+		hdd_debug("BSS stop status = %s",
 		       pSapEvent->sapevt.sapStopBssCompleteEvent.status ?
 		       "eSAP_STATUS_FAILURE" : "eSAP_STATUS_SUCCESS");
 
@@ -2187,9 +2187,9 @@ int hdd_softap_unpack_ie(tHalHandle halHandle,
 		dot11f_unpack_ie_rsn((tpAniSirGlobal) halHandle,
 				     pRsnIe, RSNIeLen, &dot11RSNIE);
 		/* Copy out the encryption and authentication types */
-		hdd_notice("pairwise cipher suite count: %d",
+		hdd_debug("pairwise cipher suite count: %d",
 		       dot11RSNIE.pwise_cipher_suite_count);
-		hdd_notice("authentication suite count: %d",
+		hdd_debug("authentication suite count: %d",
 		       dot11RSNIE.akm_suite_count);
 		/*Here we have followed the apple base code,
 		   but probably I suspect we can do something different */
@@ -2223,9 +2223,9 @@ int hdd_softap_unpack_ie(tHalHandle halHandle,
 		dot11f_unpack_ie_wpa((tpAniSirGlobal) halHandle,
 				     pRsnIe, RSNIeLen, &dot11WPAIE);
 		/* Copy out the encryption and authentication types */
-		hdd_notice("WPA unicast cipher suite count: %d",
+		hdd_debug("WPA unicast cipher suite count: %d",
 		       dot11WPAIE.unicast_cipher_count);
-		hdd_notice("WPA authentication suite count: %d",
+		hdd_debug("WPA authentication suite count: %d",
 		       dot11WPAIE.auth_suite_count);
 		/* dot11WPAIE.auth_suite_count */
 		/* Just translate the FIRST one */
@@ -2242,7 +2242,7 @@ int hdd_softap_unpack_ie(tHalHandle halHandle,
 		*pMFPCapable = false;
 		*pMFPRequired = false;
 	} else {
-		hdd_warn("gen_ie[0]: %d", gen_ie[0]);
+		hdd_err("gen_ie[0]: %d", gen_ie[0]);
 		return QDF_STATUS_E_FAILURE;
 	}
 	return QDF_STATUS_SUCCESS;
@@ -2320,7 +2320,7 @@ int hdd_softap_set_channel_change(struct net_device *dev, int target_channel,
 		target_bw);
 
 	if (QDF_STATUS_SUCCESS != status) {
-		hdd_err("SAP set channel failed for channel = %d, bw:%d",
+		hdd_err("SAP set channel failed for channel: %d, bw: %d",
 		       target_channel, target_bw);
 		/*
 		 * If channel change command fails then clear the
@@ -2385,7 +2385,7 @@ static __iw_softap_set_ini_cfg(struct net_device *dev,
 	if (ret)
 		return ret;
 
-	hdd_notice("Received data %s", extra);
+	hdd_debug("Received data %s", extra);
 
 	vstatus = hdd_execute_global_config_command(pHddCtx, extra);
 	if (QDF_STATUS_SUCCESS != vstatus) {
@@ -2425,7 +2425,7 @@ static int hdd_sap_get_chan_width(hdd_adapter_t *adapter, int *value)
 	cds_ctx = WLAN_HDD_GET_SAP_CTX_PTR(adapter);
 
 	*value = wlansap_get_chan_width(cds_ctx);
-	hdd_notice("chan_width = %d", *value);
+	hdd_debug("chan_width = %d", *value);
 
 	return 0;
 }
@@ -2446,7 +2446,7 @@ static __iw_softap_get_ini_cfg(struct net_device *dev,
 	if (ret != 0)
 		return ret;
 
-	hdd_notice("Printing CLD global INI Config");
+	hdd_debug("Printing CLD global INI Config");
 	hdd_cfg_get_global_config(pHddCtx, extra, QCSAP_IOCTL_MAX_STR_LEN);
 	wrqu->data.length = strlen(extra) + 1;
 
@@ -2509,7 +2509,7 @@ static int __iw_softap_set_two_ints_getnone(struct net_device *dev,
 		break;
 #endif
 	case QCSAP_IOCTL_DUMP_DP_TRACE_LEVEL:
-		hdd_info("WE_DUMP_DP_TRACE: %d %d",
+		hdd_debug("WE_DUMP_DP_TRACE: %d %d",
 		       value[1], value[2]);
 		if (value[1] == DUMP_DP_TRACE)
 			qdf_dp_trace_dump_all(value[2]);
@@ -2519,20 +2519,20 @@ static int __iw_softap_set_two_ints_getnone(struct net_device *dev,
 			qdf_dp_trace_clear_buffer();
 		break;
 	case QCSAP_ENABLE_FW_PROFILE:
-		hdd_notice("QCSAP_ENABLE_FW_PROFILE: %d %d",
+		hdd_debug("QCSAP_ENABLE_FW_PROFILE: %d %d",
 		       value[1], value[2]);
 		ret = wma_cli_set2_command(adapter->sessionId,
 				 WMI_WLAN_PROFILE_ENABLE_PROFILE_ID_CMDID,
 					value[1], value[2], DBG_CMD);
 		break;
 	case QCSAP_SET_FW_PROFILE_HIST_INTVL:
-		hdd_notice("QCSAP_SET_FW_PROFILE_HIST_INTVL: %d %d",
+		hdd_debug("QCSAP_SET_FW_PROFILE_HIST_INTVL: %d %d",
 		       value[1], value[2]);
 		ret = wma_cli_set2_command(adapter->sessionId,
 					WMI_WLAN_PROFILE_SET_HIST_INTVL_CMDID,
 					value[1], value[2], DBG_CMD);
 	default:
-		hdd_err("Invalid IOCTL command %d", sub_cmd);
+		hdd_err("Invalid IOCTL command: %d", sub_cmd);
 		break;
 	}
 
@@ -2649,7 +2649,7 @@ static __iw_softap_setparam(struct net_device *dev,
 
 	switch (sub_cmd) {
 	case QCASAP_SET_RADAR_DBG:
-		hdd_notice("QCASAP_SET_RADAR_DBG called with: value: %d",
+		hdd_debug("QCASAP_SET_RADAR_DBG called with: value: %d",
 		       set_value);
 		wlan_sap_enable_phy_error_logs(hHal, (bool) set_value);
 		break;
@@ -2664,8 +2664,7 @@ static __iw_softap_setparam(struct net_device *dev,
 	case QCSAP_PARAM_ACL_MODE:
 		if ((eSAP_ALLOW_ALL < (eSapMacAddrACL) set_value) ||
 		    (eSAP_ACCEPT_UNLESS_DENIED > (eSapMacAddrACL) set_value)) {
-			hdd_err("Invalid ACL Mode value %d",
-			       set_value);
+			hdd_err("Invalid ACL Mode value: %d", set_value);
 			ret = -EINVAL;
 		} else {
 			wlansap_set_mode(
@@ -2677,7 +2676,7 @@ static __iw_softap_setparam(struct net_device *dev,
 	case QCSAP_PARAM_SET_CHANNEL_CHANGE:
 		if ((QDF_SAP_MODE == pHostapdAdapter->device_mode) ||
 		   (QDF_P2P_GO_MODE == pHostapdAdapter->device_mode)) {
-			hdd_notice("SET Channel Change to new channel= %d",
+			hdd_debug("SET Channel Change to new channel= %d",
 			       set_value);
 			ret = hdd_softap_set_channel_change(dev, set_value,
 								CH_WIDTH_MAX);
@@ -2695,10 +2694,10 @@ static __iw_softap_setparam(struct net_device *dev,
 			ret = -EINVAL;
 		break;
 	case QCSAP_PARAM_CONC_SYSTEM_PREF:
-		hdd_info("New preference: %d", set_value);
+		hdd_debug("New preference: %d", set_value);
 		if (!((set_value >= CFG_CONC_SYSTEM_PREF_MIN) &&
 				(set_value <= CFG_CONC_SYSTEM_PREF_MAX))) {
-			hdd_err("Invalid system preference %d", set_value);
+			hdd_err("Invalid system preference: %d", set_value);
 			return -EINVAL;
 		}
 		/* hdd_ctx, hdd_ctx->config are already checked for null */
@@ -2720,7 +2719,7 @@ static __iw_softap_setparam(struct net_device *dev,
 			status = sme_cfg_set_int(hHal, WNI_CFG_ASSOC_STA_LIMIT,
 					set_value);
 			if (status != QDF_STATUS_SUCCESS) {
-				hdd_err("setMaxAssoc failure, status %d",
+				hdd_err("setMaxAssoc failure, status: %d",
 				       status);
 				ret = -EIO;
 			}
@@ -2744,7 +2743,7 @@ static __iw_softap_setparam(struct net_device *dev,
 		tSirRateUpdateInd rateUpdate = {0};
 		struct hdd_config *pConfig = hdd_ctx->config;
 
-		hdd_notice("MC Target rate %d", set_value);
+		hdd_debug("MC Target rate %d", set_value);
 		qdf_copy_macaddr(&rateUpdate.bssid,
 				 &pHostapdAdapter->macAddressCurrent);
 		rateUpdate.nss = (pConfig->enable2x2 == 0) ? 0 : 1;
@@ -2763,7 +2762,7 @@ static __iw_softap_setparam(struct net_device *dev,
 
 	case QCSAP_PARAM_SET_TXRX_FW_STATS:
 	{
-		hdd_notice("QCSAP_PARAM_SET_TXRX_FW_STATS val %d", set_value);
+		hdd_debug("QCSAP_PARAM_SET_TXRX_FW_STATS val %d", set_value);
 		ret = wma_cli_set_command(pHostapdAdapter->sessionId,
 					  WMA_VDEV_TXRX_FWSTATS_ENABLE_CMDID,
 					  set_value, VDEV_CMD);
@@ -2772,7 +2771,7 @@ static __iw_softap_setparam(struct net_device *dev,
 	/* Firmware debug log */
 	case QCSAP_DBGLOG_LOG_LEVEL:
 	{
-		hdd_notice("QCSAP_DBGLOG_LOG_LEVEL val %d", set_value);
+		hdd_debug("QCSAP_DBGLOG_LOG_LEVEL val %d", set_value);
 		ret = wma_cli_set_command(pHostapdAdapter->sessionId,
 					  WMI_DBGLOG_LOG_LEVEL,
 					  set_value, DBG_CMD);
@@ -2781,7 +2780,7 @@ static __iw_softap_setparam(struct net_device *dev,
 
 	case QCSAP_DBGLOG_VAP_ENABLE:
 	{
-		hdd_notice("QCSAP_DBGLOG_VAP_ENABLE val %d", set_value);
+		hdd_debug("QCSAP_DBGLOG_VAP_ENABLE val %d", set_value);
 		ret = wma_cli_set_command(pHostapdAdapter->sessionId,
 					  WMI_DBGLOG_VAP_ENABLE,
 					  set_value, DBG_CMD);
@@ -2790,7 +2789,7 @@ static __iw_softap_setparam(struct net_device *dev,
 
 	case QCSAP_DBGLOG_VAP_DISABLE:
 	{
-		hdd_notice("QCSAP_DBGLOG_VAP_DISABLE val %d", set_value);
+		hdd_debug("QCSAP_DBGLOG_VAP_DISABLE val %d", set_value);
 		ret = wma_cli_set_command(pHostapdAdapter->sessionId,
 					  WMI_DBGLOG_VAP_DISABLE,
 					  set_value, DBG_CMD);
@@ -2799,7 +2798,7 @@ static __iw_softap_setparam(struct net_device *dev,
 
 	case QCSAP_DBGLOG_MODULE_ENABLE:
 	{
-		hdd_notice("QCSAP_DBGLOG_MODULE_ENABLE val %d", set_value);
+		hdd_debug("QCSAP_DBGLOG_MODULE_ENABLE val %d", set_value);
 		ret = wma_cli_set_command(pHostapdAdapter->sessionId,
 					  WMI_DBGLOG_MODULE_ENABLE,
 					  set_value, DBG_CMD);
@@ -2808,7 +2807,7 @@ static __iw_softap_setparam(struct net_device *dev,
 
 	case QCSAP_DBGLOG_MODULE_DISABLE:
 	{
-		hdd_notice("QCSAP_DBGLOG_MODULE_DISABLE val %d", set_value);
+		hdd_debug("QCSAP_DBGLOG_MODULE_DISABLE val %d", set_value);
 		ret = wma_cli_set_command(pHostapdAdapter->sessionId,
 					  WMI_DBGLOG_MODULE_DISABLE,
 					  set_value, DBG_CMD);
@@ -2817,7 +2816,7 @@ static __iw_softap_setparam(struct net_device *dev,
 
 	case QCSAP_DBGLOG_MOD_LOG_LEVEL:
 	{
-		hdd_notice("QCSAP_DBGLOG_MOD_LOG_LEVEL val %d", set_value);
+		hdd_debug("QCSAP_DBGLOG_MOD_LOG_LEVEL val %d", set_value);
 		ret = wma_cli_set_command(pHostapdAdapter->sessionId,
 					  WMI_DBGLOG_MOD_LOG_LEVEL,
 					  set_value, DBG_CMD);
@@ -2826,7 +2825,7 @@ static __iw_softap_setparam(struct net_device *dev,
 
 	case QCSAP_DBGLOG_TYPE:
 	{
-		hdd_notice("QCSAP_DBGLOG_TYPE val %d", set_value);
+		hdd_debug("QCSAP_DBGLOG_TYPE val %d", set_value);
 		ret = wma_cli_set_command(pHostapdAdapter->sessionId,
 					  WMI_DBGLOG_TYPE,
 					  set_value, DBG_CMD);
@@ -2834,7 +2833,7 @@ static __iw_softap_setparam(struct net_device *dev,
 	}
 	case QCSAP_DBGLOG_REPORT_ENABLE:
 	{
-		hdd_notice("QCSAP_DBGLOG_REPORT_ENABLE val %d", set_value);
+		hdd_debug("QCSAP_DBGLOG_REPORT_ENABLE val %d", set_value);
 		ret = wma_cli_set_command(pHostapdAdapter->sessionId,
 					  WMI_DBGLOG_REPORT_ENABLE,
 					  set_value, DBG_CMD);
@@ -2848,7 +2847,7 @@ static __iw_softap_setparam(struct net_device *dev,
 
 	case QCSAP_PARAM_SET_MCC_CHANNEL_QUOTA:
 	{
-		hdd_notice("iwpriv cmd to set MCC quota value %dms",
+		hdd_debug("iwpriv cmd to set MCC quota value %dms",
 		       set_value);
 		ret = cds_go_set_mcc_p2p_quota(pHostapdAdapter,
 						    set_value);
@@ -2857,7 +2856,7 @@ static __iw_softap_setparam(struct net_device *dev,
 
 	case QCASAP_TXRX_FWSTATS_RESET:
 	{
-		hdd_notice("WE_TXRX_FWSTATS_RESET val %d", set_value);
+		hdd_debug("WE_TXRX_FWSTATS_RESET val %d", set_value);
 		ret = wma_cli_set_command(pHostapdAdapter->sessionId,
 					  WMA_VDEV_TXRX_FWSTATS_RESET_CMDID,
 					  set_value, VDEV_CMD);
@@ -2881,7 +2880,7 @@ static __iw_softap_setparam(struct net_device *dev,
 		tsap_Config_t *pConfig =
 			&pHostapdAdapter->sessionCtx.ap.sapConfig;
 
-		hdd_notice("SET_HT_RATE val %d", set_value);
+		hdd_debug("SET_HT_RATE val %d", set_value);
 
 		if (set_value != 0xff) {
 			rix = RC_2_RATE_IDX(set_value);
@@ -2930,7 +2929,7 @@ static __iw_softap_setparam(struct net_device *dev,
 			}
 			set_value = (preamble << 6) | (nss << 4) | rix;
 		}
-		hdd_notice("SET_HT_RATE val %d rix %d preamble %x nss %d",
+		hdd_debug("SET_HT_RATE val %d rix %d preamble %x nss %d",
 		       set_value, rix, preamble, nss);
 		ret = wma_cli_set_command(pHostapdAdapter->sessionId,
 					  WMI_VDEV_PARAM_FIXED_RATE,
@@ -2946,7 +2945,7 @@ static __iw_softap_setparam(struct net_device *dev,
 
 		if (pConfig->SapHw_mode != eCSR_DOT11_MODE_11ac &&
 		    pConfig->SapHw_mode != eCSR_DOT11_MODE_11ac_ONLY) {
-			hdd_err("SET_VHT_RATE error: SapHw_mode= 0x%x, ch = %d",
+			hdd_err("SET_VHT_RATE error: SapHw_mode= 0x%x, ch: %d",
 			       pConfig->SapHw_mode, pConfig->channel);
 			ret = -EIO;
 			break;
@@ -2959,7 +2958,7 @@ static __iw_softap_setparam(struct net_device *dev,
 
 			set_value = (preamble << 6) | (nss << 4) | rix;
 		}
-		hdd_notice("SET_VHT_RATE val %d rix %d preamble %x nss %d",
+		hdd_debug("SET_VHT_RATE val %d rix %d preamble %x nss %d",
 		       set_value, rix, preamble, nss);
 
 		ret = wma_cli_set_command(pHostapdAdapter->sessionId,
@@ -2970,20 +2969,20 @@ static __iw_softap_setparam(struct net_device *dev,
 
 	case QCASAP_SHORT_GI:
 	{
-		hdd_notice("QCASAP_SET_SHORT_GI val %d", set_value);
+		hdd_debug("QCASAP_SET_SHORT_GI val %d", set_value);
 
 		/* same as 40MHZ */
 		ret = sme_update_ht_config(hHal, pHostapdAdapter->sessionId,
 					   WNI_CFG_HT_CAP_INFO_SHORT_GI_20MHZ,
 					   set_value);
 		if (ret)
-			hdd_err("Failed to set ShortGI value ret(%d)", ret);
+			hdd_err("Failed to set ShortGI value ret: %d", ret);
 		break;
 	}
 
 	case QCSAP_SET_AMPDU:
 	{
-		hdd_notice("QCSAP_SET_AMPDU %d", set_value);
+		hdd_debug("QCSAP_SET_AMPDU %d", set_value);
 		ret = wma_cli_set_command(pHostapdAdapter->sessionId,
 					  GEN_VDEV_PARAM_AMPDU,
 					  set_value, GEN_CMD);
@@ -2992,7 +2991,7 @@ static __iw_softap_setparam(struct net_device *dev,
 
 	case QCSAP_SET_AMSDU:
 	{
-		hdd_notice("QCSAP_SET_AMSDU %d", set_value);
+		hdd_debug("QCSAP_SET_AMSDU %d", set_value);
 		ret = wma_cli_set_command(pHostapdAdapter->sessionId,
 					  GEN_VDEV_PARAM_AMSDU,
 					  set_value, GEN_CMD);
@@ -3000,7 +2999,7 @@ static __iw_softap_setparam(struct net_device *dev,
 	}
 	case QCSAP_GTX_HT_MCS:
 	{
-		hdd_notice("WMI_VDEV_PARAM_GTX_HT_MCS %d", set_value);
+		hdd_debug("WMI_VDEV_PARAM_GTX_HT_MCS %d", set_value);
 		ret = wma_cli_set_command(pHostapdAdapter->sessionId,
 					  WMI_VDEV_PARAM_GTX_HT_MCS,
 					  set_value, GTX_CMD);
@@ -3009,7 +3008,7 @@ static __iw_softap_setparam(struct net_device *dev,
 
 	case QCSAP_GTX_VHT_MCS:
 	{
-		hdd_notice("WMI_VDEV_PARAM_GTX_VHT_MCS %d", set_value);
+		hdd_debug("WMI_VDEV_PARAM_GTX_VHT_MCS %d", set_value);
 		ret = wma_cli_set_command(pHostapdAdapter->sessionId,
 					  WMI_VDEV_PARAM_GTX_VHT_MCS,
 						set_value, GTX_CMD);
@@ -3018,7 +3017,7 @@ static __iw_softap_setparam(struct net_device *dev,
 
 	case QCSAP_GTX_USRCFG:
 	{
-		hdd_notice("WMI_VDEV_PARAM_GTX_USR_CFG %d", set_value);
+		hdd_debug("WMI_VDEV_PARAM_GTX_USR_CFG %d", set_value);
 		ret = wma_cli_set_command(pHostapdAdapter->sessionId,
 					  WMI_VDEV_PARAM_GTX_USR_CFG,
 					  set_value, GTX_CMD);
@@ -3027,7 +3026,7 @@ static __iw_softap_setparam(struct net_device *dev,
 
 	case QCSAP_GTX_THRE:
 	{
-		hdd_notice("WMI_VDEV_PARAM_GTX_THRE %d", set_value);
+		hdd_debug("WMI_VDEV_PARAM_GTX_THRE %d", set_value);
 		ret = wma_cli_set_command(pHostapdAdapter->sessionId,
 					  WMI_VDEV_PARAM_GTX_THRE,
 					  set_value, GTX_CMD);
@@ -3036,7 +3035,7 @@ static __iw_softap_setparam(struct net_device *dev,
 
 	case QCSAP_GTX_MARGIN:
 	{
-		hdd_notice("WMI_VDEV_PARAM_GTX_MARGIN %d", set_value);
+		hdd_debug("WMI_VDEV_PARAM_GTX_MARGIN %d", set_value);
 		ret = wma_cli_set_command(pHostapdAdapter->sessionId,
 					  WMI_VDEV_PARAM_GTX_MARGIN,
 					  set_value, GTX_CMD);
@@ -3045,7 +3044,7 @@ static __iw_softap_setparam(struct net_device *dev,
 
 	case QCSAP_GTX_STEP:
 	{
-		hdd_notice("WMI_VDEV_PARAM_GTX_STEP %d", set_value);
+		hdd_debug("WMI_VDEV_PARAM_GTX_STEP %d", set_value);
 		ret = wma_cli_set_command(pHostapdAdapter->sessionId,
 					  WMI_VDEV_PARAM_GTX_STEP,
 					  set_value, GTX_CMD);
@@ -3054,7 +3053,7 @@ static __iw_softap_setparam(struct net_device *dev,
 
 	case QCSAP_GTX_MINTPC:
 	{
-		hdd_notice("WMI_VDEV_PARAM_GTX_MINTPC %d", set_value);
+		hdd_debug("WMI_VDEV_PARAM_GTX_MINTPC %d", set_value);
 		ret = wma_cli_set_command(pHostapdAdapter->sessionId,
 					  WMI_VDEV_PARAM_GTX_MINTPC,
 					  set_value, GTX_CMD);
@@ -3063,7 +3062,7 @@ static __iw_softap_setparam(struct net_device *dev,
 
 	case QCSAP_GTX_BWMASK:
 	{
-		hdd_notice("WMI_VDEV_PARAM_GTX_BWMASK %d", set_value);
+		hdd_debug("WMI_VDEV_PARAM_GTX_BWMASK %d", set_value);
 		ret = wma_cli_set_command(pHostapdAdapter->sessionId,
 					  WMI_VDEV_PARAM_GTX_BW_MASK,
 					  set_value, GTX_CMD);
@@ -3072,14 +3071,14 @@ static __iw_softap_setparam(struct net_device *dev,
 
 	case QCASAP_SET_TM_LEVEL:
 	{
-		hdd_notice("Set Thermal Mitigation Level %d", set_value);
+		hdd_debug("Set Thermal Mitigation Level %d", set_value);
 		(void)sme_set_thermal_level(hHal, set_value);
 		break;
 	}
 
 	case QCASAP_SET_DFS_IGNORE_CAC:
 	{
-		hdd_notice("Set Dfs ignore CAC  %d", set_value);
+		hdd_debug("Set Dfs ignore CAC  %d", set_value);
 
 		if (pHostapdAdapter->device_mode != QDF_SAP_MODE)
 			return -EINVAL;
@@ -3090,7 +3089,7 @@ static __iw_softap_setparam(struct net_device *dev,
 
 	case QCASAP_SET_DFS_TARGET_CHNL:
 	{
-		hdd_notice("Set Dfs target channel  %d", set_value);
+		hdd_debug("Set Dfs target channel  %d", set_value);
 
 		if (pHostapdAdapter->device_mode != QDF_SAP_MODE)
 			return -EINVAL;
@@ -3118,7 +3117,7 @@ static __iw_softap_setparam(struct net_device *dev,
 		isDfsch = (CHANNEL_STATE_DFS ==
 			   cds_get_channel_state(ch));
 
-		hdd_notice("Set QCASAP_SET_RADAR_CMD val %d", set_value);
+		hdd_debug("Set QCASAP_SET_RADAR_CMD val %d", set_value);
 
 		dfs_radar_found = qdf_atomic_read(&pHddCtx->dfs_radar_found);
 		if (!dfs_radar_found && isDfsch) {
@@ -3133,7 +3132,7 @@ static __iw_softap_setparam(struct net_device *dev,
 	}
 	case QCASAP_TX_CHAINMASK_CMD:
 	{
-		hdd_notice("QCASAP_TX_CHAINMASK_CMD val %d", set_value);
+		hdd_debug("QCASAP_TX_CHAINMASK_CMD val %d", set_value);
 		ret = wma_cli_set_command(pHostapdAdapter->sessionId,
 					  WMI_PDEV_PARAM_TX_CHAIN_MASK,
 					  set_value, PDEV_CMD);
@@ -3142,7 +3141,7 @@ static __iw_softap_setparam(struct net_device *dev,
 
 	case QCASAP_RX_CHAINMASK_CMD:
 	{
-		hdd_notice("QCASAP_RX_CHAINMASK_CMD val %d", set_value);
+		hdd_debug("QCASAP_RX_CHAINMASK_CMD val %d", set_value);
 		ret = wma_cli_set_command(pHostapdAdapter->sessionId,
 					  WMI_PDEV_PARAM_RX_CHAIN_MASK,
 					  set_value, PDEV_CMD);
@@ -3151,7 +3150,7 @@ static __iw_softap_setparam(struct net_device *dev,
 
 	case QCASAP_NSS_CMD:
 	{
-		hdd_notice("QCASAP_NSS_CMD val %d", set_value);
+		hdd_debug("QCASAP_NSS_CMD val %d", set_value);
 		ret = wma_cli_set_command(pHostapdAdapter->sessionId,
 					  WMI_VDEV_PARAM_NSS,
 					  set_value, VDEV_CMD);
@@ -3192,7 +3191,7 @@ static __iw_softap_setparam(struct net_device *dev,
 	}
 	case QCASAP_DUMP_STATS:
 	{
-		hdd_notice("QCASAP_DUMP_STATS val %d", set_value);
+		hdd_debug("QCASAP_DUMP_STATS val %d", set_value);
 		ret = hdd_wlan_dump_stats(pHostapdAdapter, set_value);
 		break;
 	}
@@ -3200,7 +3199,7 @@ static __iw_softap_setparam(struct net_device *dev,
 	{
 		hdd_context_t *hdd_ctx =
 			WLAN_HDD_GET_CTX(pHostapdAdapter);
-		hdd_notice("QCASAP_CLEAR_STATS val %d", set_value);
+		hdd_debug("QCASAP_CLEAR_STATS val %d", set_value);
 		switch (set_value) {
 		case WLAN_HDD_STATS:
 			memset(&pHostapdAdapter->stats, 0,
@@ -3227,7 +3226,7 @@ static __iw_softap_setparam(struct net_device *dev,
 		break;
 	}
 	case QCSAP_START_FW_PROFILING:
-		hdd_notice("QCSAP_START_FW_PROFILING %d", set_value);
+		hdd_debug("QCSAP_START_FW_PROFILING %d", set_value);
 		ret = wma_cli_set_command(pHostapdAdapter->sessionId,
 					WMI_WLAN_PROFILE_TRIGGER_CMDID,
 					set_value, DBG_CMD);
@@ -3281,7 +3280,7 @@ static int __iw_softap_get_three(struct net_device *dev,
 		ret = hdd_indicate_tsf(adapter, value, 3);
 		break;
 	default:
-		hdd_err("Invalid getparam command %d", sub_cmd);
+		hdd_err("Invalid getparam command: %d", sub_cmd);
 		ret = -EINVAL;
 		break;
 	}
@@ -3391,7 +3390,7 @@ static __iw_softap_getparam(struct net_device *dev,
 
 	case QCSAP_GTX_HT_MCS:
 	{
-		hdd_notice("GET WMI_VDEV_PARAM_GTX_HT_MCS");
+		hdd_debug("GET WMI_VDEV_PARAM_GTX_HT_MCS");
 		*value = wma_cli_get_command(pHostapdAdapter->sessionId,
 					     WMI_VDEV_PARAM_GTX_HT_MCS,
 					     GTX_CMD);
@@ -3400,7 +3399,7 @@ static __iw_softap_getparam(struct net_device *dev,
 
 	case QCSAP_GTX_VHT_MCS:
 	{
-		hdd_notice("GET WMI_VDEV_PARAM_GTX_VHT_MCS");
+		hdd_debug("GET WMI_VDEV_PARAM_GTX_VHT_MCS");
 		*value = wma_cli_get_command(pHostapdAdapter->sessionId,
 					     WMI_VDEV_PARAM_GTX_VHT_MCS,
 					     GTX_CMD);
@@ -3409,7 +3408,7 @@ static __iw_softap_getparam(struct net_device *dev,
 
 	case QCSAP_GTX_USRCFG:
 	{
-		hdd_notice("GET WMI_VDEV_PARAM_GTX_USR_CFG");
+		hdd_debug("GET WMI_VDEV_PARAM_GTX_USR_CFG");
 		*value = wma_cli_get_command(pHostapdAdapter->sessionId,
 					     WMI_VDEV_PARAM_GTX_USR_CFG,
 					     GTX_CMD);
@@ -3418,7 +3417,7 @@ static __iw_softap_getparam(struct net_device *dev,
 
 	case QCSAP_GTX_THRE:
 	{
-		hdd_notice("GET WMI_VDEV_PARAM_GTX_THRE");
+		hdd_debug("GET WMI_VDEV_PARAM_GTX_THRE");
 		*value = wma_cli_get_command(pHostapdAdapter->sessionId,
 					     WMI_VDEV_PARAM_GTX_THRE,
 					     GTX_CMD);
@@ -3427,7 +3426,7 @@ static __iw_softap_getparam(struct net_device *dev,
 
 	case QCSAP_GTX_MARGIN:
 	{
-		hdd_notice("GET WMI_VDEV_PARAM_GTX_MARGIN");
+		hdd_debug("GET WMI_VDEV_PARAM_GTX_MARGIN");
 		*value = wma_cli_get_command(pHostapdAdapter->sessionId,
 					     WMI_VDEV_PARAM_GTX_MARGIN,
 					     GTX_CMD);
@@ -3436,7 +3435,7 @@ static __iw_softap_getparam(struct net_device *dev,
 
 	case QCSAP_GTX_STEP:
 	{
-		hdd_notice("GET WMI_VDEV_PARAM_GTX_STEP");
+		hdd_debug("GET WMI_VDEV_PARAM_GTX_STEP");
 		*value = wma_cli_get_command(pHostapdAdapter->sessionId,
 					     WMI_VDEV_PARAM_GTX_STEP,
 					     GTX_CMD);
@@ -3445,7 +3444,7 @@ static __iw_softap_getparam(struct net_device *dev,
 
 	case QCSAP_GTX_MINTPC:
 	{
-		hdd_notice("GET WMI_VDEV_PARAM_GTX_MINTPC");
+		hdd_debug("GET WMI_VDEV_PARAM_GTX_MINTPC");
 		*value = wma_cli_get_command(pHostapdAdapter->sessionId,
 					     WMI_VDEV_PARAM_GTX_MINTPC,
 					     GTX_CMD);
@@ -3454,7 +3453,7 @@ static __iw_softap_getparam(struct net_device *dev,
 
 	case QCSAP_GTX_BWMASK:
 	{
-		hdd_notice("GET WMI_VDEV_PARAM_GTX_BW_MASK");
+		hdd_debug("GET WMI_VDEV_PARAM_GTX_BW_MASK");
 		*value = wma_cli_get_command(pHostapdAdapter->sessionId,
 					     WMI_VDEV_PARAM_GTX_BW_MASK,
 					     GTX_CMD);
@@ -3471,7 +3470,7 @@ static __iw_softap_getparam(struct net_device *dev,
 
 	case QCSAP_GET_ACL:
 	{
-		hdd_notice("QCSAP_GET_ACL");
+		hdd_debug("QCSAP_GET_ACL");
 		if (hdd_print_acl(pHostapdAdapter) !=
 		    QDF_STATUS_SUCCESS) {
 			hdd_err("QCSAP_GET_ACL returned Error: not completed");
@@ -3482,7 +3481,7 @@ static __iw_softap_getparam(struct net_device *dev,
 
 	case QCASAP_TX_CHAINMASK_CMD:
 	{
-		hdd_notice("QCASAP_TX_CHAINMASK_CMD");
+		hdd_debug("QCASAP_TX_CHAINMASK_CMD");
 		*value = wma_cli_get_command(pHostapdAdapter->sessionId,
 					     WMI_PDEV_PARAM_TX_CHAIN_MASK,
 					     PDEV_CMD);
@@ -3491,7 +3490,7 @@ static __iw_softap_getparam(struct net_device *dev,
 
 	case QCASAP_RX_CHAINMASK_CMD:
 	{
-		hdd_notice("QCASAP_RX_CHAINMASK_CMD");
+		hdd_debug("QCASAP_RX_CHAINMASK_CMD");
 		*value = wma_cli_get_command(pHostapdAdapter->sessionId,
 					     WMI_PDEV_PARAM_RX_CHAIN_MASK,
 					     PDEV_CMD);
@@ -3500,7 +3499,7 @@ static __iw_softap_getparam(struct net_device *dev,
 
 	case QCASAP_NSS_CMD:
 	{
-		hdd_notice("QCASAP_NSS_CMD");
+		hdd_debug("QCASAP_NSS_CMD");
 		*value = wma_cli_get_command(pHostapdAdapter->sessionId,
 					     WMI_VDEV_PARAM_NSS,
 					     VDEV_CMD);
@@ -3511,12 +3510,12 @@ static __iw_softap_getparam(struct net_device *dev,
 		break;
 	case QCASAP_GET_TEMP_CMD:
 	{
-		hdd_notice("QCASAP_GET_TEMP_CMD");
+		hdd_debug("QCASAP_GET_TEMP_CMD");
 		ret = wlan_hdd_get_temperature(pHostapdAdapter, value);
 		break;
 	}
 	case QCSAP_GET_FW_PROFILE_DATA:
-		hdd_notice("QCSAP_GET_FW_PROFILE_DATA");
+		hdd_debug("QCSAP_GET_FW_PROFILE_DATA");
 		ret = wma_cli_set_command(pHostapdAdapter->sessionId,
 				WMI_WLAN_PROFILE_GET_PROFILE_DATA_CMDID,
 				0, DBG_CMD);
@@ -3542,7 +3541,7 @@ static __iw_softap_getparam(struct net_device *dev,
 		break;
 	}
 	default:
-		hdd_err("Invalid getparam command %d", sub_cmd);
+		hdd_err("Invalid getparam command: %d", sub_cmd);
 		ret = -EINVAL;
 		break;
 
@@ -3612,7 +3611,7 @@ int __iw_softap_modify_acl(struct net_device *dev,
 	i++;
 	cmd = (int)(*(value + i));
 
-	hdd_notice("Modify ACL mac:" MAC_ADDRESS_STR " type: %d cmd: %d",
+	hdd_debug("Modify ACL mac:" MAC_ADDRESS_STR " type: %d cmd: %d",
 	       MAC_ADDR_ARRAY(pPeerStaMac), listType, cmd);
 
 	qdf_status = wlansap_modify_acl(
@@ -3860,14 +3859,14 @@ static __iw_softap_getassoc_stamacaddr(struct net_device *dev,
 
 	/* make sure userspace allocated a reasonable buffer size */
 	if (wrqu->data.length < sizeof(maclist_index)) {
-		hdd_notice("invalid userspace buffer");
+		hdd_err("invalid userspace buffer");
 		return -EINVAL;
 	}
 
 	/* allocate local buffer to build the response */
 	buf = qdf_mem_malloc(wrqu->data.length);
 	if (!buf) {
-		hdd_notice("failed to allocate response buffer");
+		hdd_err("failed to allocate response buffer");
 		return -ENOMEM;
 	}
 
@@ -3891,7 +3890,7 @@ static __iw_softap_getassoc_stamacaddr(struct net_device *dev,
 	*((u32 *) buf) = maclist_index;
 	wrqu->data.length = maclist_index;
 	if (copy_to_user(wrqu->data.pointer, buf, maclist_index)) {
-		hdd_notice("failed to copy response to user buffer");
+		hdd_err("failed to copy response to user buffer");
 		ret = -EFAULT;
 	}
 	qdf_mem_free(buf);
@@ -3954,7 +3953,7 @@ static __iw_softap_disassoc_sta(struct net_device *dev,
 	 */
 	peerMacAddr = (uint8_t *) (extra);
 
-	hdd_notice("data " MAC_ADDRESS_STR,
+	hdd_debug("data " MAC_ADDRESS_STR,
 	       MAC_ADDR_ARRAY(peerMacAddr));
 	wlansap_populate_del_sta_params(peerMacAddr,
 			eSIR_MAC_DEAUTH_LEAVING_BSS_REASON,
@@ -4122,7 +4121,7 @@ static int __iw_get_channel_list(struct net_device *dev,
 		is_dfs_mode_enabled = true;
 	}
 
-	hdd_notice("curBand = %d, StartChannel = %hu, EndChannel = %hu is_dfs_mode_enabled  = %d ",
+	hdd_debug("curBand = %d, StartChannel = %hu, EndChannel = %hu is_dfs_mode_enabled  = %d ",
 			cur_band, band_start_channel, band_end_channel,
 			is_dfs_mode_enabled);
 
@@ -4136,7 +4135,7 @@ static int __iw_get_channel_list(struct net_device *dev,
 		}
 	}
 
-	hdd_notice(" number of channels %d", num_channels);
+	hdd_debug(" number of channels %d", num_channels);
 
 	channel_list->num_channels = num_channels;
 	EXIT();
@@ -4186,15 +4185,15 @@ int __iw_get_genie(struct net_device *dev,
 	if (status == QDF_STATUS_SUCCESS) {
 		wrqu->data.length = length;
 		if (length > DOT11F_IE_RSN_MAX_LEN) {
-			hdd_notice("invalid buffer length length:%d", length);
+			hdd_err("Invalid buffer length: %d", length);
 			return -E2BIG;
 		}
 		qdf_mem_copy(extra, genIeBytes, length);
-		hdd_notice(" RSN IE of %d bytes returned",
+		hdd_debug(" RSN IE of %d bytes returned",
 				wrqu->data.length);
 	} else {
 		wrqu->data.length = 0;
-		hdd_notice(" RSN IE failed to populate");
+		hdd_debug(" RSN IE failed to populate");
 	}
 
 	EXIT();
@@ -4233,7 +4232,7 @@ int __iw_get_wpspbc_probe_req_ies(struct net_device *dev,
 	if (0 != ret)
 		return ret;
 
-	hdd_notice("get_WPSPBCProbeReqIEs ioctl");
+	hdd_debug("get_WPSPBCProbeReqIEs ioctl");
 	memset((void *)&WPSPBCProbeReqIEs, 0, sizeof(WPSPBCProbeReqIEs));
 
 	WPSPBCProbeReqIEs.probeReqIELen =
@@ -4246,11 +4245,11 @@ int __iw_get_wpspbc_probe_req_ies(struct net_device *dev,
 	if (copy_to_user(wrqu->data.pointer,
 			 (void *)&WPSPBCProbeReqIEs,
 			 sizeof(WPSPBCProbeReqIEs))) {
-		hdd_notice("failed to copy data to user buffer");
+		hdd_err("failed to copy data to user buffer");
 		return -EFAULT;
 	}
 	wrqu->data.length = 12 + WPSPBCProbeReqIEs.probeReqIELen;
-	hdd_info("Macaddress : " MAC_ADDRESS_STR,
+	hdd_debug("Macaddress : " MAC_ADDRESS_STR,
 	       MAC_ADDR_ARRAY(WPSPBCProbeReqIEs.macaddr.bytes));
 	up(&pHddApCtx->semWpsPBCOverlapInd);
 	EXIT();
@@ -4302,12 +4301,12 @@ int __iw_set_auth_hostap(struct net_device *dev, struct iw_request_info *info,
 	case IW_AUTH_TKIP_COUNTERMEASURES:
 	{
 		if (wrqu->param.value) {
-			hdd_info("Counter Measure started %d",
+			hdd_debug("Counter Measure started %d",
 				 wrqu->param.value);
 			pWextState->mTKIPCounterMeasures =
 				TKIP_COUNTER_MEASURE_STARTED;
 		} else {
-			hdd_info("Counter Measure stopped=%d",
+			hdd_debug("Counter Measure stopped=%d",
 				 wrqu->param.value);
 			pWextState->mTKIPCounterMeasures =
 				TKIP_COUNTER_MEASURE_STOPED;
@@ -4434,7 +4433,7 @@ static int __iw_set_ap_encodeext(struct net_device *dev,
 			(ext->key_len ==
 			 5) ? eCSR_ENCRYPT_TYPE_WEP40 : eCSR_ENCRYPT_TYPE_WEP104;
 		pHddApCtx->uPrivacy = 1;
-		hdd_notice("uPrivacy=%d", pHddApCtx->uPrivacy);
+		hdd_debug("uPrivacy=%d", pHddApCtx->uPrivacy);
 		break;
 
 	case IW_ENCODE_ALG_TKIP:
@@ -4481,16 +4480,16 @@ static int __iw_set_ap_encodeext(struct net_device *dev,
 		break;
 	}
 
-	hdd_notice(":EncryptionType:%d key_len:%d, KeyId:%d",
+	hdd_debug(":EncryptionType:%d key_len:%d, KeyId:%d",
 	       setKey.encType, setKey.keyLength, setKey.keyId);
 	for (i = 0; i < ext->key_len; i++)
-		hdd_notice("%02x", setKey.Key[i]);
+		hdd_debug("%02x", setKey.Key[i]);
 
 	vstatus = wlansap_set_key_sta(
 		WLAN_HDD_GET_SAP_CTX_PTR(pHostapdAdapter), &setKey);
 
 	if (vstatus != QDF_STATUS_SUCCESS) {
-		hdd_err("wlansap_set_key_sta failed, status= %d",
+		hdd_err("wlansap_set_key_sta failed, status: %d",
 		       vstatus);
 		ret = -EINVAL;
 	}
@@ -5019,8 +5018,8 @@ static int __iw_set_ap_genie(struct net_device *dev,
 	}
 
 	if (wrqu->data.length > DOT11F_IE_RSN_MAX_LEN) {
-		hdd_err("%s: WPARSN Ie input length is more than max[%d]",
-			__func__, wrqu->data.length);
+		hdd_err("WPARSN Ie input length is more than max[%d]",
+			wrqu->data.length);
 		return QDF_STATUS_E_INVAL;
 	}
 
@@ -5093,7 +5092,7 @@ int __iw_get_softap_linkspeed(struct net_device *dev,
 	if (0 != valid)
 		return valid;
 
-	hdd_notice("wrqu->data.length(%d)", wrqu->data.length);
+	hdd_debug("wrqu->data.length(%d)", wrqu->data.length);
 
 	/* Linkspeed is allowed only for P2P mode */
 	if (pHostapdAdapter->device_mode != QDF_P2P_GO_MODE) {
@@ -5107,7 +5106,7 @@ int __iw_get_softap_linkspeed(struct net_device *dev,
 	if (wrqu->data.length >= MAC_ADDRESS_STR_LEN - 1) {
 		if (copy_from_user((void *)pmacAddress,
 				   wrqu->data.pointer, MAC_ADDRESS_STR_LEN)) {
-			hdd_notice("failed to copy data to user buffer");
+			hdd_err("failed to copy data to user buffer");
 			return -EFAULT;
 		}
 		pmacAddress[MAC_ADDRESS_STR_LEN - 1] = '\0';
@@ -5808,7 +5807,7 @@ QDF_STATUS hdd_init_ap_mode(hdd_adapter_t *pAdapter, bool reinit)
 	else {
 		sapContext = wlansap_open(p_cds_context);
 		if (sapContext == NULL) {
-			hdd_err("ERROR: wlansap_open failed!!");
+			hdd_err("wlansap_open failed!!");
 			return QDF_STATUS_E_FAULT;
 		}
 
@@ -5833,7 +5832,7 @@ QDF_STATUS hdd_init_ap_mode(hdd_adapter_t *pAdapter, bool reinit)
 			pAdapter->macAddressCurrent.bytes,
 			&session_id);
 	if (!QDF_IS_STATUS_SUCCESS(status)) {
-		hdd_err("ERROR: wlansap_start failed!!");
+		hdd_err("wlansap_start failed!!");
 		wlansap_close(sapContext);
 		pAdapter->sessionCtx.ap.sapContext = NULL;
 		return status;
@@ -5853,7 +5852,7 @@ QDF_STATUS hdd_init_ap_mode(hdd_adapter_t *pAdapter, bool reinit)
 	/* NOP */
 	status = hdd_set_hostapd(pAdapter);
 	if (!QDF_IS_STATUS_SUCCESS(status)) {
-		hdd_err("ERROR: hdd_set_hostapd failed!!");
+		hdd_err("hdd_set_hostapd failed!!");
 		wlansap_close(sapContext);
 		pAdapter->sessionCtx.ap.sapContext = NULL;
 		return status;
@@ -5861,7 +5860,7 @@ QDF_STATUS hdd_init_ap_mode(hdd_adapter_t *pAdapter, bool reinit)
 
 	qdf_status = qdf_event_create(&phostapdBuf->qdf_event);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-		hdd_err("ERROR: Hostapd HDD qdf event init failed!!");
+		hdd_err("Hostapd HDD qdf event init failed!!");
 		wlansap_close(sapContext);
 		pAdapter->sessionCtx.ap.sapContext = NULL;
 		return qdf_status;
@@ -5869,7 +5868,7 @@ QDF_STATUS hdd_init_ap_mode(hdd_adapter_t *pAdapter, bool reinit)
 
 	qdf_status = qdf_event_create(&phostapdBuf->qdf_stop_bss_event);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-		hdd_err("ERROR: Hostapd HDD stop bss event init failed!!");
+		hdd_err("Hostapd HDD stop bss event init failed!!");
 		wlansap_close(sapContext);
 		pAdapter->sessionCtx.ap.sapContext = NULL;
 		return qdf_status;
@@ -5877,7 +5876,7 @@ QDF_STATUS hdd_init_ap_mode(hdd_adapter_t *pAdapter, bool reinit)
 
 	qdf_status = qdf_event_create(&phostapdBuf->qdf_sta_disassoc_event);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-		hdd_err("ERROR: Hostapd HDD sta disassoc event init failed!!");
+		hdd_err("Hostapd HDD sta disassoc event init failed!!");
 		wlansap_close(sapContext);
 		pAdapter->sessionCtx.ap.sapContext = NULL;
 		return qdf_status;
@@ -5894,12 +5893,12 @@ QDF_STATUS hdd_init_ap_mode(hdd_adapter_t *pAdapter, bool reinit)
 	/* Initialize the data path module */
 	status = hdd_softap_init_tx_rx(pAdapter);
 	if (!QDF_IS_STATUS_SUCCESS(status)) {
-		hdd_alert("hdd_softap_init_tx_rx failed");
+		hdd_err("hdd_softap_init_tx_rx failed");
 	}
 
 	status = hdd_wmm_adapter_init(pAdapter);
 	if (!QDF_IS_STATUS_SUCCESS(status)) {
-		hdd_err("hdd_wmm_adapter_init() failed code %08d [x%08x]",
+		hdd_err("hdd_wmm_adapter_init() failed code: %08d [x%08x]",
 		       status, status);
 		goto error_wmm_init;
 	}
@@ -5911,9 +5910,8 @@ QDF_STATUS hdd_init_ap_mode(hdd_adapter_t *pAdapter, bool reinit)
 				  pHddCtx->config->enableSifsBurst,
 				  PDEV_CMD);
 
-	if (0 != ret) {
-		hdd_err("WMI_PDEV_PARAM_BURST_ENABLE set failed %d", ret);
-	}
+	if (0 != ret)
+		hdd_err("WMI_PDEV_PARAM_BURST_ENABLE set failed: %d", ret);
 
 	if (!reinit) {
 		pAdapter->sessionCtx.ap.sapConfig.acs_cfg.acs_mode = false;
@@ -5957,7 +5955,7 @@ hdd_adapter_t *hdd_wlan_create_ap_dev(hdd_context_t *pHddCtx,
 	struct net_device *pWlanHostapdDev = NULL;
 	hdd_adapter_t *pHostapdAdapter = NULL;
 
-	hdd_info("iface_name = %s", iface_name);
+	hdd_debug("iface_name = %s", iface_name);
 
 	pWlanHostapdDev = alloc_netdev_mq(sizeof(hdd_adapter_t), iface_name,
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 17, 0)) || defined(WITH_BACKPORTS)
@@ -5978,7 +5976,7 @@ hdd_adapter_t *hdd_wlan_create_ap_dev(hdd_context_t *pHddCtx,
 		pHostapdAdapter->magic = WLAN_HDD_ADAPTER_MAGIC;
 		pHostapdAdapter->sessionId = HDD_SESSION_ID_INVALID;
 
-		hdd_info("pWlanHostapdDev = %p, pHostapdAdapter = %p, concurrency_mode=0x%x",
+		hdd_debug("pWlanHostapdDev = %p, pHostapdAdapter = %p, concurrency_mode=0x%x",
 		       pWlanHostapdDev,
 		       pHostapdAdapter,
 		       (int)cds_get_concurrency_mode());
@@ -6094,7 +6092,7 @@ int hdd_unregister_hostapd(hdd_adapter_t *pAdapter, bool rtnl_held)
 	}
 
 	if (!test_bit(DEVICE_IFACE_OPENED, &pAdapter->event_flags)) {
-		hdd_info("iface is not opened");
+		hdd_debug("iface is not opened");
 		return 0;
 	}
 
@@ -6189,7 +6187,7 @@ int wlan_hdd_set_channel(struct wiphy *wiphy,
 
 
 	if (NULL == dev) {
-		hdd_err("Called with dev = NULL.");
+		hdd_err("Called with dev = NULL");
 		return -ENODEV;
 	}
 	pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
@@ -6198,7 +6196,7 @@ int wlan_hdd_set_channel(struct wiphy *wiphy,
 			 TRACE_CODE_HDD_CFG80211_SET_CHANNEL,
 			 pAdapter->sessionId, channel_type));
 
-	hdd_notice("Device_mode %s(%d)  freq = %d",
+	hdd_debug("Device_mode %s(%d)  freq = %d",
 	       hdd_device_mode_to_string(pAdapter->device_mode),
 	       pAdapter->device_mode, chandef->chan->center_freq);
 
@@ -6227,7 +6225,7 @@ int wlan_hdd_set_channel(struct wiphy *wiphy,
 	/* Check freq range */
 	if ((WNI_CFG_CURRENT_CHANNEL_STAMIN > channel) ||
 	    (WNI_CFG_CURRENT_CHANNEL_STAMAX < channel)) {
-		hdd_err("Channel [%d] is outside valid range from %d to %d",
+		hdd_err("Channel: %d is outside valid range from %d to %d",
 		       channel, WNI_CFG_CURRENT_CHANNEL_STAMIN,
 		       WNI_CFG_CURRENT_CHANNEL_STAMAX);
 		return -EINVAL;
@@ -6237,7 +6235,7 @@ int wlan_hdd_set_channel(struct wiphy *wiphy,
 
 	if ((WNI_CFG_CURRENT_CHANNEL_STAMIN > channel_seg2) ||
 	    (WNI_CFG_CURRENT_CHANNEL_STAMAX < channel_seg2)) {
-		hdd_err("Channel [%d] is outside valid range from %d to %d",
+		hdd_err("Channel: %d is outside valid range from %d to %d",
 		       channel_seg2, WNI_CFG_CURRENT_CHANNEL_STAMIN,
 		       WNI_CFG_CURRENT_CHANNEL_STAMAX);
 		return -EINVAL;
@@ -6249,10 +6247,10 @@ int wlan_hdd_set_channel(struct wiphy *wiphy,
 	    (QDF_P2P_GO_MODE != pAdapter->device_mode)) {
 		if (QDF_STATUS_SUCCESS !=
 		    wlan_hdd_validate_operation_channel(pAdapter, channel)) {
-			hdd_err("Invalid Channel [%d]", channel);
+			hdd_err("Invalid Channel: %d", channel);
 			return -EINVAL;
 		}
-		hdd_info("set channel to [%d] for device mode %s(%d)",
+		hdd_debug("set channel to [%d] for device mode %s(%d)",
 		       channel,
 		       hdd_device_mode_to_string(pAdapter->device_mode),
 		       pAdapter->device_mode);
@@ -6286,7 +6284,7 @@ int wlan_hdd_set_channel(struct wiphy *wiphy,
 			if (QDF_STATUS_SUCCESS !=
 			    wlan_hdd_validate_operation_channel(pAdapter,
 								channel)) {
-				hdd_err("Invalid Channel [%d]", channel);
+				hdd_err("Invalid Channel: %d", channel);
 				return -EINVAL;
 			}
 			sap_config->channel = channel;
@@ -6296,7 +6294,7 @@ int wlan_hdd_set_channel(struct wiphy *wiphy,
 			if (QDF_STATUS_SUCCESS !=
 				wlan_hdd_validate_operation_channel(pAdapter,
 								channel)) {
-				hdd_err("Invalid Channel [%d]", channel);
+				hdd_err("Invalid Channel: %d", channel);
 				return -EINVAL;
 			}
 
@@ -6446,7 +6444,7 @@ static void wlan_hdd_add_hostapd_conf_vsie(hdd_adapter_t *pHostapdAdapter,
 		elem_len = ptr[1];
 		left -= 2;
 		if (elem_len > left) {
-			hdd_err("****Invalid IEs eid = %d elem_len=%d left=%d*****",
+			hdd_err("**Invalid IEs eid: %d elem_len: %d left: %d**",
 				elem_id, elem_len, left);
 			return;
 		}
@@ -6481,7 +6479,7 @@ static void wlan_hdd_add_hostapd_conf_vsie(hdd_adapter_t *pHostapdAdapter,
 						     ielen);
 					*total_ielen += ielen;
 				} else {
-					hdd_err("IE Length is too big IEs eid=%d elem_len=%d total_ie_lent=%d",
+					hdd_err("IE Length is too big IEs eid: %d elem_len: %d total_ie_lent: %d",
 					       elem_id, elem_len, *total_ielen);
 				}
 			}
@@ -6520,7 +6518,7 @@ static void wlan_hdd_add_extra_ie(hdd_adapter_t *pHostapdAdapter,
 		elem_len = ptr[1];
 		left -= 2;
 		if (elem_len > left) {
-			hdd_err("****Invalid IEs eid = %d elem_len=%d left=%d*****",
+			hdd_err("**Invalid IEs eid: %d elem_len: %d left: %d**",
 			       elem_id, elem_len, left);
 			return;
 		}
@@ -6531,7 +6529,7 @@ static void wlan_hdd_add_extra_ie(hdd_adapter_t *pHostapdAdapter,
 				qdf_mem_copy(&genie[*total_ielen], ptr, ielen);
 				*total_ielen += ielen;
 			} else {
-				hdd_err("IE Length is too big IEs eid=%d elem_len=%d total_ie_lent=%d",
+				hdd_err("IE Length is too big IEs eid: %d elem_len: %d total_ie_len: %d",
 				       elem_id, elem_len, *total_ielen);
 			}
 		}
@@ -6572,7 +6570,7 @@ wlan_hdd_cfg80211_alloc_new_beacon(hdd_adapter_t *pAdapter,
 	old = pAdapter->sessionCtx.ap.beacon;
 
 	if (!params->head && !old) {
-		hdd_err("session(%d) old and new heads points to NULL",
+		hdd_err("session: %d old and new heads points to NULL",
 		       pAdapter->sessionId);
 		return -EINVAL;
 	}
@@ -6911,7 +6909,7 @@ QDF_STATUS wlan_hdd_config_acs(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter)
 	sap_config->enOverLapCh = !!hdd_ctx->config->gEnableOverLapCh;
 
 #ifdef FEATURE_WLAN_AP_AP_ACS_OPTIMIZE
-	hdd_notice("HDD_ACS_SKIP_STATUS = %d",
+	hdd_debug("HDD_ACS_SKIP_STATUS = %d",
 						hdd_ctx->skip_acs_scan_status);
 	if (hdd_ctx->skip_acs_scan_status == eSAP_SKIP_ACS_SCAN) {
 		hdd_adapter_t *con_sap_adapter;
@@ -7001,7 +6999,7 @@ QDF_STATUS wlan_hdd_config_acs(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter)
 							eSAP_DO_NEW_ACS_SCAN;
 
 
-			hdd_notice(FL(
+			hdd_debug(FL(
 				"SecAP ACS Skip=%d, ACS CH RANGE=%d-%d, %d-%d"),
 				sap_config->acs_cfg.skip_scan_status,
 				sap_config->acs_cfg.skip_scan_range1_stch,
@@ -7057,7 +7055,7 @@ static int wlan_hdd_setup_driver_overrides(hdd_adapter_t *ap_adapter)
 			sap_cfg->SapHw_mode == eCSR_DOT11_MODE_11ac ||
 			sap_cfg->SapHw_mode == eCSR_DOT11_MODE_11ac_ONLY) &&
 			!hdd_ctx->config->sap_force_11n_for_11ac) {
-		hdd_notice("** Driver force 11AC override for SAP/Go **");
+		hdd_debug("** Driver force 11AC override for SAP/Go **");
 
 		/* 11n only shall not be overridden since it may be on purpose*/
 		if (sap_cfg->SapHw_mode == eCSR_DOT11_MODE_11n)
@@ -7079,7 +7077,7 @@ static int wlan_hdd_setup_driver_overrides(hdd_adapter_t *ap_adapter)
 	return 0;
 
 setup_acs_overrides:
-	hdd_err("** Driver force ACS override **");
+	hdd_debug("** Driver force ACS override **");
 
 	sap_cfg->channel = AUTO_CHANNEL_SELECT;
 	sap_cfg->acs_cfg.acs_mode = true;
@@ -7144,9 +7142,9 @@ setup_acs_overrides:
 	}
 	sap_cfg->acs_cfg.ch_width = sap_cfg->ch_width_orig;
 
-	hdd_notice("Force ACS Config: HW_MODE: %d ACS_BW: %d",
+	hdd_debug("Force ACS Config: HW_MODE: %d ACS_BW: %d",
 		sap_cfg->acs_cfg.hw_mode, sap_cfg->acs_cfg.ch_width);
-	hdd_notice("Force ACS Config: ST_CH: %d END_CH: %d",
+	hdd_debug("Force ACS Config: ST_CH: %d END_CH: %d",
 		sap_cfg->acs_cfg.start_ch, sap_cfg->acs_cfg.end_ch);
 
 	return 0;
@@ -7173,7 +7171,7 @@ static int wlan_hdd_set_udp_resp_offload(hdd_adapter_t *padapter, bool enable)
 	uint8_t udp_payload_filter_len;
 	uint8_t udp_response_payload_len;
 
-	hdd_info("udp_resp_offload enable flag is %d", enable);
+	hdd_debug("udp_resp_offload enable flag is %d", enable);
 
 	/* prepare the request to send to SME */
 	if ((enable == true) &&
@@ -7186,11 +7184,11 @@ static int wlan_hdd_set_udp_resp_offload(hdd_adapter_t *padapter, bool enable)
 
 			udp_payload_filter_len =
 				strlen(pcfg_ini->payload_filter);
-			hdd_info("payload_filter[%s]",
+			hdd_debug("payload_filter[%s]",
 				pcfg_ini->payload_filter);
 			udp_response_payload_len =
 				strlen(pcfg_ini->response_payload);
-			hdd_info("response_payload[%s]",
+			hdd_debug("response_payload[%s]",
 				pcfg_ini->response_payload);
 
 			qdf_mem_copy(udp_resp_cmd_info.udp_payload_filter,
@@ -7206,7 +7204,7 @@ static int wlan_hdd_set_udp_resp_offload(hdd_adapter_t *padapter, bool enable)
 				hdd_err("sme_set_udp_resp_offload failure!");
 				return -EIO;
 			}
-			hdd_info("sme_set_udp_resp_offload success!");
+			hdd_debug("sme_set_udp_resp_offload success!");
 		}
 	} else {
 		udp_resp_cmd_info.vdev_id = padapter->sessionId;
@@ -7219,7 +7217,7 @@ static int wlan_hdd_set_udp_resp_offload(hdd_adapter_t *padapter, bool enable)
 			hdd_err("sme_set_udp_resp_offload failure!");
 			return -EIO;
 		}
-		hdd_info("sme_set_udp_resp_offload success!");
+		hdd_debug("sme_set_udp_resp_offload success!");
 	}
 	return 0;
 }
@@ -7313,10 +7311,10 @@ int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter,
 
 	pConfig->enOverLapCh = iniConfig->gEnableOverLapCh;
 	pConfig->dtim_period = pBeacon->dtim_period;
-	hdd_info("acs_mode %d", pConfig->acs_cfg.acs_mode);
+	hdd_debug("acs_mode %d", pConfig->acs_cfg.acs_mode);
 
 	if (pConfig->acs_cfg.acs_mode == true) {
-		hdd_info("acs_channel %d, acs_dfs_mode %d",
+		hdd_debug("acs_channel %d, acs_dfs_mode %d",
 			pHddCtx->acs_policy.acs_channel,
 			pHddCtx->acs_policy.acs_dfs_mode);
 
@@ -7326,10 +7324,10 @@ int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter,
 		pConfig->acs_dfs_mode = wlan_hdd_get_dfs_mode(mode);
 	}
 
-	hdd_info("pConfig->channel %d, pConfig->acs_dfs_mode %d",
+	hdd_debug("pConfig->channel %d, pConfig->acs_dfs_mode %d",
 		pConfig->channel, pConfig->acs_dfs_mode);
 
-	hdd_info("****pConfig->dtim_period=%d***",
+	hdd_debug("****pConfig->dtim_period=%d***",
 		pConfig->dtim_period);
 
 	if (pHostapdAdapter->device_mode == QDF_SAP_MODE) {
@@ -7367,8 +7365,7 @@ int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter,
 			if (QDF_STATUS_SUCCESS !=
 			    wlan_hdd_validate_operation_channel(pHostapdAdapter,
 							pConfig->channel)) {
-				hdd_err("Invalid Channel [%d]",
-							pConfig->channel);
+				hdd_err("Invalid Channel: %d", pConfig->channel);
 				ret = -EINVAL;
 				goto error;
 			}
@@ -7419,7 +7416,7 @@ int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter,
 			goto error;
 		} else if (memcmp(&pIe[2], WPS_OUI_TYPE, WPS_OUI_TYPE_SIZE) ==
 			   0) {
-			hdd_notice("** WPS IE(len %d) ***", (pIe[1] + 2));
+			hdd_debug("** WPS IE(len %d) ***", (pIe[1] + 2));
 			/* Check 15 bit of WPS IE as it contain information for
 			 * wps state
 			 */
@@ -7431,7 +7428,7 @@ int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter,
 			}
 		}
 	} else {
-		hdd_info("WPS disabled");
+		hdd_debug("WPS disabled");
 		pConfig->wps_state = SAP_WPS_DISABLED;
 	}
 	/* Forward WPS PBC probe request frame up */
@@ -7475,7 +7472,7 @@ int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter,
 			pConfig->mcRSNEncryptType = mcRSNEncryptType;
 			(WLAN_HDD_GET_AP_CTX_PTR(pHostapdAdapter))->
 			ucEncryptType = RSNEncryptType;
-			hdd_notice("CSR AuthType = %d, EncryptionType = %d mcEncryptionType = %d",
+			hdd_debug("CSR AuthType = %d, EncryptionType = %d mcEncryptionType = %d",
 			       RSNAuthType, RSNEncryptType, mcRSNEncryptType);
 		}
 	}
@@ -7493,7 +7490,7 @@ int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter,
 				memcpy(&pConfig->RSNWPAReqIE[0] +
 				       prev_rsn_length, pIe, pIe[1] + 2);
 			else
-				hdd_err("RSNWPA IE MAX Length exceeded; length =%d",
+				hdd_err("RSNWPA IE MAX Length exceeded; length: %d",
 				       pConfig->RSNWPAReqIELength);
 		} else {
 			pConfig->RSNWPAReqIELength = pIe[1] + 2;
@@ -7502,7 +7499,7 @@ int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter,
 				memcpy(&pConfig->RSNWPAReqIE[0], pIe,
 				       pConfig->RSNWPAReqIELength);
 			else
-				hdd_err("RSNWPA IE MAX Length exceeded; length =%d",
+				hdd_err("RSNWPA IE MAX Length exceeded; length: %d",
 				       pConfig->RSNWPAReqIELength);
 			status = hdd_softap_unpack_ie
 					(cds_get_context(QDF_MODULE_ID_SME),
@@ -7521,7 +7518,7 @@ int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter,
 				pConfig->mcRSNEncryptType = mcRSNEncryptType;
 				(WLAN_HDD_GET_AP_CTX_PTR(pHostapdAdapter))->
 				ucEncryptType = RSNEncryptType;
-				hdd_notice("CSR AuthType = %d, EncryptionType = %d mcEncryptionType = %d",
+				hdd_debug("CSR AuthType = %d, EncryptionType = %d mcEncryptionType = %d",
 				       RSNAuthType, RSNEncryptType,
 				       mcRSNEncryptType);
 			}
@@ -7542,20 +7539,20 @@ int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter,
 
 		switch (hidden_ssid) {
 		case NL80211_HIDDEN_SSID_NOT_IN_USE:
-			hdd_notice("HIDDEN_SSID_NOT_IN_USE");
+			hdd_debug("HIDDEN_SSID_NOT_IN_USE");
 			pConfig->SSIDinfo.ssidHidden = eHIDDEN_SSID_NOT_IN_USE;
 			break;
 		case NL80211_HIDDEN_SSID_ZERO_LEN:
-			hdd_notice("HIDDEN_SSID_ZERO_LEN");
+			hdd_debug("HIDDEN_SSID_ZERO_LEN");
 			pConfig->SSIDinfo.ssidHidden = eHIDDEN_SSID_ZERO_LEN;
 			break;
 		case NL80211_HIDDEN_SSID_ZERO_CONTENTS:
-			hdd_notice("HIDDEN_SSID_ZERO_CONTENTS");
+			hdd_debug("HIDDEN_SSID_ZERO_CONTENTS");
 			pConfig->SSIDinfo.ssidHidden =
 				eHIDDEN_SSID_ZERO_CONTENTS;
 			break;
 		default:
-			hdd_err("Wrong hidden_ssid param %d", hidden_ssid);
+			hdd_err("Wrong hidden_ssid param: %d", hidden_ssid);
 			break;
 		}
 	}
@@ -7598,7 +7595,7 @@ int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter,
 	if ((pIe != NULL) && (pIe[1] != 0)) {
 		pConfig->SapMacaddr_acl = pIe[6];
 		pConfig->num_deny_mac = pIe[7];
-		hdd_notice("acl type = %d no deny mac = %d", pIe[6], pIe[7]);
+		hdd_debug("acl type = %d no deny mac = %d", pIe[6], pIe[7]);
 		if (pConfig->num_deny_mac > MAX_ACL_MAC_ADDRESS)
 			pConfig->num_deny_mac = MAX_ACL_MAC_ADDRESS;
 		acl_entry = (struct qc_mac_acl_entry *)(pIe + 8);
@@ -7624,7 +7621,7 @@ int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter,
 	if ((pIe != NULL) && (pIe[1] != 0)) {
 		pConfig->SapMacaddr_acl = pIe[6];
 		pConfig->num_accept_mac = pIe[7];
-		hdd_notice("acl type = %d no accept mac = %d",
+		hdd_debug("acl type = %d no accept mac = %d",
 		       pIe[6], pIe[7]);
 		if (pConfig->num_accept_mac > MAX_ACL_MAC_ADDRESS)
 			pConfig->num_accept_mac = MAX_ACL_MAC_ADDRESS;
@@ -7649,7 +7646,7 @@ int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter,
 			     i < pConfig->supported_rates.numRates; i++) {
 				if (pIe[i]) {
 				     pConfig->supported_rates.rate[i] = pIe[i];
-				     hdd_info("Configured Supported rate is %2x",
+				     hdd_debug("Configured Supported rate is %2x",
 					pConfig->supported_rates.rate[i]);
 				}
 			}
@@ -7664,7 +7661,7 @@ int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter,
 			for (i = 0; i < pConfig->extended_rates.numRates; i++) {
 				if (pIe[i]) {
 				      pConfig->extended_rates.rate[i] = pIe[i];
-				      hdd_info("Configured ext Supported rate is %2x",
+				      hdd_debug("Configured ext Supported rate is %2x",
 					pConfig->extended_rates.rate[i]);
 				}
 			}
@@ -7732,7 +7729,7 @@ int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter,
 	else /* for P2P-Go case */
 		pConfig->sap_dot11mc = 1;
 
-	hdd_notice("11MC Support Enabled : %d\n",
+	hdd_debug("11MC Support Enabled : %d\n",
 		pConfig->sap_dot11mc);
 
 #ifdef WLAN_FEATURE_11W
@@ -7742,23 +7739,23 @@ int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter,
 	       pConfig->mfpCapable, pConfig->mfpRequired);
 #endif
 
-	hdd_warn("SOftAP macaddress : " MAC_ADDRESS_STR,
+	hdd_debug("SOftAP macaddress : " MAC_ADDRESS_STR,
 	       MAC_ADDR_ARRAY(pHostapdAdapter->macAddressCurrent.bytes));
-	hdd_warn("ssid =%s, beaconint=%d, channel=%d",
+	hdd_debug("ssid =%s, beaconint=%d, channel=%d",
 	       pConfig->SSIDinfo.ssid.ssId, (int)pConfig->beacon_int,
 	       (int)pConfig->channel);
-	hdd_warn("hw_mode=%x, privacy=%d, authType=%d",
+	hdd_debug("hw_mode=%x, privacy=%d, authType=%d",
 	       pConfig->SapHw_mode, pConfig->privacy, pConfig->authType);
-	hdd_warn("RSN/WPALen=%d, Uapsd = %d",
+	hdd_debug("RSN/WPALen=%d, Uapsd = %d",
 	       (int)pConfig->RSNWPAReqIELength, pConfig->UapsdEnable);
-	hdd_warn("ProtEnabled = %d, OBSSProtEnabled = %d",
+	hdd_debug("ProtEnabled = %d, OBSSProtEnabled = %d",
 	       pConfig->protEnabled, pConfig->obssProtEnabled);
 
 	if (test_bit(SOFTAP_BSS_STARTED, &pHostapdAdapter->event_flags)) {
 		wlansap_reset_sap_config_add_ie(pConfig, eUPDATE_IE_ALL);
 		/* Bss already started. just return. */
 		/* TODO Probably it should update some beacon params. */
-		hdd_err("Bss Already started...Ignore the request");
+		hdd_debug("Bss Already started...Ignore the request");
 		EXIT();
 		return 0;
 	}
@@ -7768,7 +7765,7 @@ int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter,
 					cds_convert_device_mode_to_qdf_type(
 					pHostapdAdapter->device_mode),
 					pConfig->channel, HW_MODE_20_MHZ)) {
-			hdd_warn("This concurrency combination is not allowed");
+			hdd_err("This concurrency combination is not allowed");
 			ret = -EINVAL;
 			goto error;
 		}
@@ -7799,7 +7796,7 @@ int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter,
 		goto error;
 	}
 
-	hdd_notice("Waiting for Scan to complete(auto mode) and BSS to start");
+	hdd_debug("Waiting for Scan to complete(auto mode) and BSS to start");
 
 	qdf_status = qdf_wait_single_event(&pHostapdState->qdf_event,
 						SME_CMD_TIMEOUT_VALUE);
@@ -7807,7 +7804,7 @@ int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter,
 	wlansap_reset_sap_config_add_ie(pConfig, eUPDATE_IE_ALL);
 
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-		hdd_err("ERROR: HDD qdf wait for single_event failed!!");
+		hdd_err("qdf wait for single_event failed!!");
 		cds_set_connection_in_progress(false);
 		sme_get_command_q_status(hHal);
 		wlansap_stop_bss(WLAN_HDD_GET_SAP_CTX_PTR(pHostapdAdapter));
@@ -7831,10 +7828,10 @@ int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter,
 	if (pHostapdAdapter->device_mode == QDF_P2P_GO_MODE) {
 		if (global_p2p_connection_status == P2P_GO_NEG_COMPLETED) {
 			global_p2p_connection_status = P2P_GO_COMPLETED_STATE;
-			hdd_err("[P2P State] From Go nego completed to Non-autonomous Group started");
+			hdd_debug("[P2P State] From Go nego completed to Non-autonomous Group started");
 		} else if (global_p2p_connection_status == P2P_NOT_ACTIVE) {
 			global_p2p_connection_status = P2P_GO_COMPLETED_STATE;
-			hdd_err("[P2P State] From Inactive to Autonomous Group started");
+			hdd_debug("[P2P State] From Inactive to Autonomous Group started");
 		}
 	}
 #endif
@@ -7891,7 +7888,7 @@ static int __wlan_hdd_cfg80211_stop_ap(struct wiphy *wiphy,
 	}
 
 	if (wlan_hdd_validate_session_id(pAdapter->sessionId)) {
-		hdd_err("invalid session id: %d", pAdapter->sessionId);
+		hdd_err("Invalid session id: %d", pAdapter->sessionId);
 		return -EINVAL;
 	}
 
@@ -7909,7 +7906,7 @@ static int __wlan_hdd_cfg80211_stop_ap(struct wiphy *wiphy,
 	 * call during SSR case. Adapter gets cleaned up as part of SSR.
 	 */
 	clear_bit(SOFTAP_INIT_DONE, &pAdapter->event_flags);
-	hdd_notice("Device_mode %s(%d)",
+	hdd_debug("Device_mode %s(%d)",
 		hdd_device_mode_to_string(pAdapter->device_mode),
 		pAdapter->device_mode);
 
@@ -7932,7 +7929,7 @@ static int __wlan_hdd_cfg80211_stop_ap(struct wiphy *wiphy,
 			pScanInfo = &staAdapter->scan_info;
 
 			if (pScanInfo && pScanInfo->mScanPending) {
-				hdd_notice("Aborting pending scan for device mode:%d",
+				hdd_debug("Aborting pending scan for device mode:%d",
 				       staAdapter->device_mode);
 				INIT_COMPLETION(pScanInfo->abortscan_event_var);
 				hdd_abort_mac_scan(staAdapter->pHddCtx,
@@ -7961,7 +7958,7 @@ static int __wlan_hdd_cfg80211_stop_ap(struct wiphy *wiphy,
 	if (pHddCtx->config->conc_custom_rule1 &&
 	    (QDF_SAP_MODE == pAdapter->device_mode)) {
 		cds_flush_work(&pHddCtx->sap_start_work);
-		hdd_warn("Canceled the pending restart work");
+		hdd_debug("Canceled the pending restart work");
 		qdf_spin_lock(&pHddCtx->sap_update_info_lock);
 		pHddCtx->is_sap_restart_required = false;
 		qdf_spin_unlock(&pHddCtx->sap_update_info_lock);
@@ -7977,7 +7974,7 @@ static int __wlan_hdd_cfg80211_stop_ap(struct wiphy *wiphy,
 
 	old = pAdapter->sessionCtx.ap.beacon;
 	if (!old) {
-		hdd_err("Session(%d) beacon data points to NULL",
+		hdd_err("Session id: %d beacon data points to NULL",
 		       pAdapter->sessionId);
 		return -EINVAL;
 	}
@@ -7999,7 +7996,7 @@ static int __wlan_hdd_cfg80211_stop_ap(struct wiphy *wiphy,
 					SME_CMD_TIMEOUT_VALUE);
 
 			if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-				hdd_err("HDD qdf wait for single_event failed!!");
+				hdd_err("qdf wait for single_event failed!!");
 				QDF_ASSERT(0);
 			}
 		}
@@ -8043,7 +8040,7 @@ static int __wlan_hdd_cfg80211_stop_ap(struct wiphy *wiphy,
 #ifdef WLAN_FEATURE_P2P_DEBUG
 	if ((pAdapter->device_mode == QDF_P2P_GO_MODE) &&
 	    (global_p2p_connection_status == P2P_GO_COMPLETED_STATE)) {
-		hdd_err("[P2P State] From GO completed to Inactive state GO got removed");
+		hdd_debug("[P2P State] From GO completed to Inactive state GO got removed");
 		global_p2p_connection_status = P2P_NOT_ACTIVE;
 	}
 #endif
@@ -8135,7 +8132,7 @@ static int __wlan_hdd_cfg80211_start_ap(struct wiphy *wiphy,
 	}
 
 	if (wlan_hdd_validate_session_id(pAdapter->sessionId)) {
-		hdd_err("invalid session id: %d", pAdapter->sessionId);
+		hdd_err("Invalid session id: %d", pAdapter->sessionId);
 		return -EINVAL;
 	}
 
@@ -8152,12 +8149,12 @@ static int __wlan_hdd_cfg80211_start_ap(struct wiphy *wiphy,
 	if (0 != status)
 		return status;
 
-	hdd_info("pAdapter = %p, Device mode %s(%d) sub20 %d",
+	hdd_debug("pAdapter = %p, Device mode %s(%d) sub20 %d",
 		pAdapter, hdd_device_mode_to_string(pAdapter->device_mode),
 		pAdapter->device_mode, cds_is_sub_20_mhz_enabled());
 
 	if (pHddCtx->btCoexModeSet) {
-		hdd_info("BTCoex Mode operation in progress");
+		hdd_debug("BTCoex Mode operation in progress");
 		return -EBUSY;
 	}
 
@@ -8185,7 +8182,7 @@ static int __wlan_hdd_cfg80211_start_ap(struct wiphy *wiphy,
 
 		/* Avoid ACS/DFS, and overwrite ch wd to 20 */
 		if (channel == 0) {
-			hdd_err("Can't start SAP-ACS (channel=0) with sub 20 MHz ch width.");
+			hdd_err("Can't start SAP-ACS (channel=0) with sub 20 MHz ch width");
 			return -EINVAL;
 		}
 		if (CHANNEL_STATE_DFS == cds_get_channel_state(channel)) {
@@ -8208,7 +8205,7 @@ static int __wlan_hdd_cfg80211_start_ap(struct wiphy *wiphy,
 			ch_state = cds_get_2g_bonded_channel_state(channel,
 							  sub_20_ch_width, 0);
 		if (CHANNEL_STATE_DISABLE == ch_state) {
-			hdd_err("Given ch width not supported by reg domain.");
+			hdd_err("Given ch width not supported by reg domain");
 			return -EINVAL;
 		}
 		sap_cfg->SapHw_mode = eCSR_DOT11_MODE_abg;
@@ -8251,7 +8248,7 @@ static int __wlan_hdd_cfg80211_start_ap(struct wiphy *wiphy,
 		hdd_adapter_t  *p2p_adapter;
 		p2p_adapter = hdd_get_adapter(pHddCtx, QDF_P2P_DEVICE_MODE);
 		if (p2p_adapter) {
-			hdd_info("cancel active p2p device ROC before GO "
+			hdd_debug("cancel active p2p device ROC before GO "
 				"starting");
 			wlan_hdd_cancel_existing_remain_on_channel(
 				p2p_adapter);
@@ -8330,7 +8327,7 @@ static int __wlan_hdd_cfg80211_start_ap(struct wiphy *wiphy,
 		if (status == 0) {
 			if (0 !=
 				wlan_hdd_set_udp_resp_offload(pAdapter, true))
-				hdd_notice("set udp resp cmd failed %d",
+				hdd_debug("set udp resp cmd failed %d",
 								status);
 		}
 	}
@@ -8393,7 +8390,7 @@ static int __wlan_hdd_cfg80211_change_beacon(struct wiphy *wiphy,
 	MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_CFG80211_CHANGE_BEACON,
 			 pAdapter->sessionId, pAdapter->device_mode));
-	hdd_notice("Device_mode %s(%d)",
+	hdd_debug("Device_mode %s(%d)",
 	       hdd_device_mode_to_string(pAdapter->device_mode),
 	       pAdapter->device_mode);
 
@@ -8411,7 +8408,7 @@ static int __wlan_hdd_cfg80211_change_beacon(struct wiphy *wiphy,
 	old = pAdapter->sessionCtx.ap.beacon;
 
 	if (!old) {
-		hdd_err("session(%d) beacon data points to NULL",
+		hdd_err("session id: %d beacon data points to NULL",
 		       pAdapter->sessionId);
 		return -EINVAL;
 	}
@@ -8426,7 +8423,7 @@ static int __wlan_hdd_cfg80211_change_beacon(struct wiphy *wiphy,
 	pAdapter->sessionCtx.ap.beacon = new;
 	update_beacon = (pAdapter->device_mode ==
 			     QDF_P2P_GO_MODE) ? true : false;
-	hdd_info("update beacon for P2P GO: %d", update_beacon);
+	hdd_debug("update beacon for P2P GO: %d", update_beacon);
 	status = wlan_hdd_cfg80211_start_bss(pAdapter, params, NULL,
 					0, 0, false, update_beacon);
 
@@ -8504,7 +8501,7 @@ void hdd_sap_indicate_disconnect_for_sta(hdd_adapter_t *adapter)
 
 	for (sta_id = 0; sta_id < WLAN_MAX_STA_COUNT; sta_id++) {
 		if (adapter->aStaInfo[sta_id].isUsed) {
-			hdd_info("sta_id: %d isUsed: %d %p",
+			hdd_debug("sta_id: %d isUsed: %d %p",
 				 sta_id, adapter->aStaInfo[sta_id].isUsed,
 				 adapter);