qcacld-3.0: Replace QDF_TRACE(QDF_MODULE_ID_SAP,...) with sap log macros

qcacld-3.0: Replace QDF_TRACE(QDF_MODULE_ID_SAP,...) with
sap_{debug|info|warn|err|alert()}

CRs-Fixed: 2755126
Change-Id: I58ef919175e0043b8a5a60c7a14e4ca3e672cb84

core/sap/src/sap_api_link_cntl.c

@@ -145,8 +145,7 @@ static QDF_STATUS sap_hdd_signal_event_handler(void *ctx)
 	QDF_STATUS status;
 
 	if (!sap_ctx) {
-		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
-				FL("sap context is not valid"));
+		sap_err("sap context is not valid");
 		return QDF_STATUS_E_FAILURE;
 	}
 	status = sap_signal_hdd_event(sap_ctx, NULL,
@@ -185,15 +184,12 @@ static void wlansap_send_acs_success_event(struct sap_context *sap_ctx,
 					   uint32_t scan_id)
 {
 	if (scan_id) {
-		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_DEBUG,
-			  FL("Sending ACS Scan skip event"));
+		sap_debug("Sending ACS Scan skip event");
 		sap_signal_hdd_event(sap_ctx, NULL,
 				     eSAP_ACS_SCAN_SUCCESS_EVENT,
 				     (void *)eSAP_STATUS_SUCCESS);
 	} else {
-		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_DEBUG,
-			  FL("ACS scanid: %d (skipped ACS SCAN)"),
-			  scan_id);
+		sap_debug("ACS scanid: %d (skipped ACS SCAN)", scan_id);
 	}
 }
 #else
@@ -225,8 +221,7 @@ wlansap_calculate_chan_from_scan_result(mac_handle_t mac_handle,
 		qdf_mem_free(filter);
 
 	if (list)
-		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_DEBUG,
-			  FL("num_entries %d"), qdf_list_size(list));
+		sap_debug("num_entries %d", qdf_list_size(list));
 
 	wlansap_send_acs_success_event(sap_ctx, scan_id);
 
@@ -331,8 +326,7 @@ QDF_STATUS wlansap_pre_start_bss_acs_scan_callback(mac_handle_t mac_handle,
 		goto close_session;
 	}
 	if (eCSR_SCAN_SUCCESS != scan_status) {
-		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
-			FL("CSR scan_status = eCSR_SCAN_ABORT/FAILURE (%d), choose default channel"),
+		sap_err("CSR scan_status = eCSR_SCAN_ABORT/FAILURE (%d), choose default channel",
 			scan_status);
 		oper_channel =
 			sap_select_default_oper_chan(mac_ctx,
@@ -345,15 +339,13 @@ QDF_STATUS wlansap_pre_start_bss_acs_scan_callback(mac_handle_t mac_handle,
 		sap_ctx->sap_status = eSAP_STATUS_SUCCESS;
 		goto close_session;
 	}
-	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
-		FL("CSR scan_status = eCSR_SCAN_SUCCESS (%d)"), scan_status);
+	sap_debug("CSR scan_status = eCSR_SCAN_SUCCESS (%d)", scan_status);
 
 	oper_channel = wlansap_calculate_chan_from_scan_result(mac_handle,
 							       sap_ctx, scanid);
 
 	if (oper_channel == SAP_CHANNEL_NOT_SELECTED) {
-		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO,
-			  FL("No suitable channel, so select default channel"));
+		sap_info("No suitable channel, so select default channel");
 		oper_channel = sap_select_default_oper_chan(mac_ctx,
 							    sap_ctx->acs_cfg);
 	}
@@ -418,8 +410,7 @@ wlansap_roam_process_ch_change_success(struct mac_context *mac_ctx,
 	/* If SAP is not in starting or started state don't proceed further */
 	if (sap_ctx->fsm_state == SAP_INIT ||
 	    sap_ctx->fsm_state == SAP_STOPPING) {
-		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO,
-			  FL("sapdfs: state [%d] not starting SAP after channel change"),
+		sap_info("sapdfs: state [%d] not starting SAP after channel change",
 			  sap_ctx->fsm_state);
 		return;
 	}
@@ -518,9 +509,7 @@ wlansap_roam_process_dfs_chansw_update(mac_handle_t mac_handle,
 	bool sap_scc_dfs;
 
 	if (mac_ctx->mlme_cfg->dfs_cfg.dfs_disable_channel_switch) {
-		QDF_TRACE(QDF_MODULE_ID_SAP,
-			  QDF_TRACE_LEVEL_ERROR,
-			  FL("sapdfs: DFS channel switch disabled"));
+		sap_err("sapdfs: DFS channel switch disabled");
 		/*
 		 * Send a beacon start request to PE. CSA IE required flag from
 		 * beacon template will be cleared by now. A new beacon template
@@ -539,15 +528,12 @@ wlansap_roam_process_dfs_chansw_update(mac_handle_t mac_handle,
 	 */
 	if (sap_ctx->fsm_state != SAP_STARTED) {
 		/* Further actions to be taken here */
-		QDF_TRACE(QDF_MODULE_ID_SAP,
-			  QDF_TRACE_LEVEL_WARN,
-			  FL("eCSR_ROAM_RESULT_DFS_RADAR_FOUND_IND received in (%d) state"),
+		sap_warn("eCSR_ROAM_RESULT_DFS_RADAR_FOUND_IND received in (%d) state",
 			  sap_ctx->fsm_state);
 		return;
 	}
 
-	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_MED,
-		  FL("sapdfs: from state SAP_STARTED => SAP_STOPPING"));
+	sap_debug("sapdfs: from state SAP_STARTED => SAP_STOPPING");
 	sap_ctx->is_chan_change_inprogress = true;
 	/*
 	 * The associated stations have been informed to move to a different
@@ -625,8 +611,7 @@ wlansap_roam_process_dfs_chansw_update(mac_handle_t mac_handle,
 	 */
 	if (false ==
 	    is_concurrent_sap_ready_for_channel_change(mac_handle, sap_ctx)) {
-		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_MED,
-			  FL("sapdfs: sapctx[%pK] ready but not concurrent sap"),
+		sap_debug("sapdfs: sapctx[%pK] ready but not concurrent sap",
 			  sap_ctx);
 		*ret_status = QDF_STATUS_SUCCESS;
 		return;
@@ -640,8 +625,7 @@ wlansap_roam_process_dfs_chansw_update(mac_handle_t mac_handle,
 		    && (mac_ctx->sap.sapCtxList[intf].sap_context)))
 			continue;
 		sap_context = mac_ctx->sap.sapCtxList[intf].sap_context;
-		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_MED,
-			  FL("sapdfs:issue chnl change for sapctx[%pK]"),
+		sap_debug("sapdfs:issue chnl change for sapctx[%pK]",
 			  sap_context);
 		sap_get_cac_dur_dfs_region(sap_context,
 			&sap_context->csr_roamProfile.cac_duration_ms,
@@ -653,9 +637,7 @@ wlansap_roam_process_dfs_chansw_update(mac_handle_t mac_handle,
 		qdf_status = wlansap_channel_change_request(sap_context,
 				mac_ctx->sap.SapDfsInfo.target_chan_freq);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
-				  FL("post chnl chng req failed, sap[%pK]"),
-				  sap_ctx);
+			sap_err("post chnl chng req failed, sap[%pK]", sap_ctx);
 			*ret_status = QDF_STATUS_E_FAILURE;
 		} else {
 			sap_context->is_sap_ready_for_chnl_chng = false;
@@ -684,20 +666,14 @@ wlansap_roam_process_dfs_radar_found(struct mac_context *mac_ctx,
 
 	if (sap_is_dfs_cac_wait_state(sap_ctx)) {
 		if (mac_ctx->mlme_cfg->dfs_cfg.dfs_disable_channel_switch) {
-			QDF_TRACE(QDF_MODULE_ID_SAP,
-				QDF_TRACE_LEVEL_ERROR,
-				"sapdfs: DFS channel switch disabled");
+			sap_err("sapdfs: DFS channel switch disabled");
 			return;
 		}
 		if (false == mac_ctx->sap.SapDfsInfo.sap_radar_found_status) {
-			QDF_TRACE(QDF_MODULE_ID_SAP,
-				QDF_TRACE_LEVEL_ERROR,
-				"sapdfs: sap_radar_found_status is false");
+			sap_err("sapdfs: sap_radar_found_status is false");
 			return;
 		}
-		QDF_TRACE(QDF_MODULE_ID_SAP,
-			  QDF_TRACE_LEVEL_INFO_MED,
-			  FL("sapdfs:Posting event eSAP_DFS_CHANNEL_CAC_RADAR_FOUND"));
+		sap_debug("sapdfs:Posting event eSAP_DFS_CHANNEL_CAC_RADAR_FOUND");
 		/*
 		 * If Radar is found, while in DFS CAC WAIT State then post stop
 		 * and destroy the CAC timer and post a
@@ -720,8 +696,7 @@ wlansap_roam_process_dfs_radar_found(struct mac_context *mac_ctx,
 				eSAP_DFS_CAC_INTERRUPTED,
 				(void *) eSAP_STATUS_SUCCESS);
 		if (QDF_STATUS_SUCCESS != qdf_status) {
-			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
-				FL("Failed to send CAC end"));
+			sap_err("Failed to send CAC end");
 			/* Want to still proceed and try to switch channel.
 			 * Lets try not to be on the DFS channel
 			 */
@@ -737,8 +712,7 @@ wlansap_roam_process_dfs_radar_found(struct mac_context *mac_ctx,
 		return;
 	}
 	if (sap_ctx->fsm_state == SAP_STARTED) {
-		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_MED,
-			  FL("sapdfs:Posting event eSAP_DFS_CHNL_SWITCH_ANNOUNCEMENT_START"));
+		sap_debug("sapdfs:Posting event eSAP_DFS_CHNL_SWITCH_ANNOUNCEMENT_START");
 
 		/*
 		 * Radar found on the operating channel in STARTED state,
@@ -755,9 +729,8 @@ wlansap_roam_process_dfs_radar_found(struct mac_context *mac_ctx,
 		return;
 	}
 	/* Further actions to be taken here */
-	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
-		  FL("eCSR_ROAM_RESULT_DFS_RADAR_FOUND_IND received in (%d) state"),
-		  sap_ctx->fsm_state);
+	sap_err("eCSR_ROAM_RESULT_DFS_RADAR_FOUND_IND received in (%d) state",
+		 sap_ctx->fsm_state);
 
 	return;
 }
@@ -781,8 +754,7 @@ wlansap_roam_process_infra_assoc_ind(struct sap_context *sap_ctx,
 {
 	QDF_STATUS qdf_status;
 
-	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
-		  FL("CSR roam_result = eCSR_ROAM_RESULT_INFRA_ASSOCIATION_IND (%d)"),
+	sap_debug("CSR roam_result = eCSR_ROAM_RESULT_INFRA_ASSOCIATION_IND (%d)",
 		  roam_result);
 	sap_ctx->nStaWPARSnReqIeLength = csr_roam_info->rsnIELen;
 	if (sap_ctx->nStaWPARSnReqIeLength)
@@ -797,15 +769,13 @@ wlansap_roam_process_infra_assoc_ind(struct sap_context *sap_ctx,
 				csr_roam_info, eSAP_STA_ASSOC_IND,
 				(void *) eSAP_STATUS_SUCCESS);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
-				  FL("CSR roam_result = (%d) MAC ("QDF_MAC_ADDR_FMT") fail"),
+			sap_err("CSR roam_result = (%d) MAC ("QDF_MAC_ADDR_FMT") fail",
 				  roam_result, QDF_MAC_ADDR_REF(
 					csr_roam_info->peerMac.bytes));
 		*ret_status = QDF_STATUS_E_FAILURE;
 		}
 	} else {
-		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_WARN,
-			  FL("CSR roam_result = (%d) MAC ("QDF_MAC_ADDR_FMT") not allowed"),
+		sap_warn("CSR roam_result = (%d) MAC ("QDF_MAC_ADDR_FMT") not allowed",
 			  roam_result,
 			  QDF_MAC_ADDR_REF(csr_roam_info->peerMac.bytes));
 		*ret_status = QDF_STATUS_E_FAILURE;
@@ -819,7 +789,7 @@ static void wlansap_update_vendor_acs_chan(struct mac_context *mac_ctx,
 	int intf;
 
 	if (!mac_ctx) {
-		QDF_TRACE_ERROR(QDF_MODULE_ID_SAP, "Invalid MAC context");
+		sap_err("Invalid MAC context");
 		return;
 	}
 
@@ -838,8 +808,7 @@ static void wlansap_update_vendor_acs_chan(struct mac_context *mac_ctx,
 		return;
 	}
 	/* App failed to provide new channel, try random channel algo */
-	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
-		  FL("failed to get channel from userspace"));
+	sap_warn("Failed to get channel from userspace");
 
 	/* Issue stopbss for each sapctx */
 	for (intf = 0; intf < SAP_MAX_NUM_SESSION; intf++) {
@@ -853,10 +822,8 @@ static void wlansap_update_vendor_acs_chan(struct mac_context *mac_ctx,
 		    NULL) {
 			sap_context =
 			    mac_ctx->sap.sapCtxList[intf].sap_context;
-			QDF_TRACE(QDF_MODULE_ID_SAP,
-				  QDF_TRACE_LEVEL_ERROR,
-				  FL("sapdfs: no available channel for sapctx[%pK], StopBss"),
-				  sap_context);
+			sap_err("sapdfs: no available channel for sapctx[%pK], StopBss",
+				 sap_context);
 			wlansap_stop_bss(sap_context);
 		}
 	}
@@ -883,21 +850,18 @@ QDF_STATUS wlansap_roam_callback(void *ctx,
 
 	mac_ctx = sap_get_mac_context();
 	if (!mac_ctx) {
-		QDF_TRACE_ERROR(QDF_MODULE_ID_SAP, "Invalid MAC context");
+		sap_err("Invalid MAC context");
 		wlansap_context_put(sap_ctx);
 		return QDF_STATUS_E_NOMEM;
 	}
-	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
-			FL("roam_status = %d, roam_result = %d"),
-			roam_status, roam_result);
+	sap_debug("CSR roam_status = %s(%d), roam_result = %s(%d)",
+		  get_e_roam_cmd_status_str(roam_status), roam_status,
+		  get_e_csr_roam_result_str(roam_result), roam_result);
 
 	mac_handle = MAC_HANDLE(mac_ctx);
 
 	switch (roam_status) {
 	case eCSR_ROAM_INFRA_IND:
-		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
-			  FL("CSR roam_status = eCSR_ROAM_INFRA_IND (%d)"),
-			  roam_status);
 		if (roam_result == eCSR_ROAM_RESULT_INFRA_START_FAILED) {
 			/* Fill in the event structure */
 			sap_event.event = eSAP_MAC_START_FAILS;
@@ -911,46 +875,28 @@ QDF_STATUS wlansap_roam_callback(void *ctx,
 		}
 		break;
 	case eCSR_ROAM_LOSTLINK:
-		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
-			  FL("CSR roam_status = eCSR_ROAM_LOSTLINK (%d)"),
-			  roam_status);
 		break;
 	case eCSR_ROAM_MIC_ERROR_IND:
-		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
-			  FL("CSR roam_status = eCSR_ROAM_MIC_ERROR_IND (%d)"),
-			  roam_status);
 		break;
 	case eCSR_ROAM_SET_KEY_COMPLETE:
-		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
-			  FL("CSR roam_status = eCSR_ROAM_SET_KEY_COMPLETE (%d)"),
-			  roam_status);
 		if (roam_result == eCSR_ROAM_RESULT_FAILURE)
 			sap_signal_hdd_event(sap_ctx, csr_roam_info,
 					     eSAP_STA_SET_KEY_EVENT,
 					     (void *) eSAP_STATUS_FAILURE);
 		break;
 	case eCSR_ROAM_ASSOCIATION_COMPLETION:
-		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
-			  FL("CSR roam_status = eCSR_ROAM_ASSOCIATION_COMPLETION (%d)"),
-			  roam_status);
 		if (roam_result == eCSR_ROAM_RESULT_FAILURE)
 			sap_signal_hdd_event(sap_ctx, csr_roam_info,
 					     eSAP_STA_REASSOC_EVENT,
 					     (void *) eSAP_STATUS_FAILURE);
 		break;
 	case eCSR_ROAM_DISASSOCIATED:
-		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
-			  FL("CSR roam_status = eCSR_ROAM_DISASSOCIATED (%d)"),
-			  roam_status);
 		if (roam_result == eCSR_ROAM_RESULT_MIC_FAILURE)
 			sap_signal_hdd_event(sap_ctx, csr_roam_info,
 					     eSAP_STA_MIC_FAILURE_EVENT,
 					     (void *) eSAP_STATUS_FAILURE);
 		break;
 	case eCSR_ROAM_WPS_PBC_PROBE_REQ_IND:
-		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
-			  FL("CSR roam_status = eCSR_ROAM_WPS_PBC_PROBE_REQ_IND (%d)"),
-			  roam_status);
 		break;
 	case eCSR_ROAM_DISCONNECT_ALL_P2P_CLIENTS:
 		sap_signal_hdd_event(sap_ctx, csr_roam_info,
@@ -958,35 +904,29 @@ QDF_STATUS wlansap_roam_callback(void *ctx,
 				     (void *) eSAP_STATUS_SUCCESS);
 		break;
 	case eCSR_ROAM_SEND_P2P_STOP_BSS:
-		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
-			  FL("Received stopbss"));
+		sap_debug("Received stopbss");
 		sap_signal_hdd_event(sap_ctx, csr_roam_info,
 				     eSAP_MAC_TRIG_STOP_BSS_EVENT,
 				     (void *) eSAP_STATUS_SUCCESS);
 		break;
 	case eCSR_ROAM_CHANNEL_COMPLETE_IND:
-		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
-			  FL("Received new channel from app"));
+		sap_debug("Received new channel from app");
 		wlansap_update_vendor_acs_chan(mac_ctx, sap_ctx);
 		break;
 
 	case eCSR_ROAM_DFS_RADAR_IND:
-		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_DEBUG,
-			  "Rcvd Radar Indication on sap ch freq %d, session %d",
+		sap_debug("Rcvd Radar Indication on sap ch freq %d, session %d",
 			  sap_ctx->chan_freq, sap_ctx->sessionId);
 
 		if (!policy_mgr_get_dfs_master_dynamic_enabled(
 				mac_ctx->psoc, sap_ctx->sessionId)) {
-			QDF_TRACE(QDF_MODULE_ID_SAP,
-				  QDF_TRACE_LEVEL_DEBUG,
-				  FL("Ignore the Radar indication"));
+			sap_debug("Ignore the Radar indication");
 			goto EXIT;
 		}
 
 		if (sap_ctx->fsm_state != SAP_STARTED &&
 		    !sap_is_dfs_cac_wait_state(sap_ctx)) {
-			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_DEBUG,
-				  FL("Ignore Radar event in sap state %d cac wait state %d"),
+			sap_debug("Ignore Radar event in sap state %d cac wait state %d",
 				  sap_ctx->fsm_state,
 				  sap_is_dfs_cac_wait_state(sap_ctx));
 			goto EXIT;
@@ -996,15 +936,13 @@ QDF_STATUS wlansap_roam_callback(void *ctx,
 			sap_ctx, wlan_reg_freq_to_chan(mac_ctx->pdev,
 						       sap_ctx->chan_freq),
 			PHY_CHANNEL_BONDING_STATE_MAX))  {
-			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_DEBUG,
-				  "Ignore Radar event for sap ch freq%d",
+			sap_debug("Ignore Radar event for sap ch freq: %d",
 				  sap_ctx->chan_freq);
 			goto EXIT;
 		}
 
 		if (sap_ctx->is_pre_cac_on) {
-			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_DEBUG,
-				  FL("sapdfs: Radar detect on pre cac:%d"),
+			sap_debug("sapdfs: Radar detect on pre cac:%d",
 				  sap_ctx->sessionId);
 			if (!sap_ctx->dfs_cac_offload) {
 				qdf_mc_timer_stop(
@@ -1020,8 +958,7 @@ QDF_STATUS wlansap_roam_callback(void *ctx,
 			break;
 		}
 
-		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_MED,
-			  FL("sapdfs: Indicate eSAP_DFS_RADAR_DETECT to HDD"));
+		sap_debug("sapdfs: Indicate eSAP_DFS_RADAR_DETECT to HDD");
 		sap_signal_hdd_event(sap_ctx, NULL, eSAP_DFS_RADAR_DETECT,
 				     (void *) eSAP_STATUS_SUCCESS);
 		mac_ctx->sap.SapDfsInfo.target_chan_freq =
@@ -1073,20 +1010,16 @@ QDF_STATUS wlansap_roam_callback(void *ctx,
 		}
 		break;
 	case eCSR_ROAM_DFS_CHAN_SW_NOTIFY:
-		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
-			  FL("Received Chan Sw Update Notification"));
+		sap_debug("Received Chan Sw Update Notification");
 		break;
 	case eCSR_ROAM_SET_CHANNEL_RSP:
-		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
-			  FL("Received set channel response"));
+		sap_debug("Received set channel response");
 		break;
 	case eCSR_ROAM_CAC_COMPLETE_IND:
-		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
-			  FL("Received cac complete indication"));
+		sap_debug("Received cac complete indication");
 		break;
 	case eCSR_ROAM_EXT_CHG_CHNL_IND:
-		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
-				FL("Received set channel Indication"));
+		sap_debug("Received set channel Indication");
 		break;
 	default:
 		break;
@@ -1101,14 +1034,10 @@ QDF_STATUS wlansap_roam_callback(void *ctx,
 		break;
 	case eCSR_ROAM_RESULT_INFRA_ASSOCIATION_CNF:
 		if (!csr_roam_info) {
-			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
-				  "csr_roam_info is NULL");
+			sap_err("csr_roam_info is NULL");
 			qdf_ret_status = QDF_STATUS_E_NULL_VALUE;
 			break;
 		}
-		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
-			  FL("CSR roam_result = eCSR_ROAM_RESULT_INFRA_ASSOCIATION_CNF (%d)"),
-			  roam_result);
 		sap_ctx->nStaWPARSnReqIeLength = csr_roam_info->rsnIELen;
 		if (sap_ctx->nStaWPARSnReqIeLength)
 			qdf_mem_copy(sap_ctx->pStaWpaRsnReqIE,
@@ -1124,9 +1053,6 @@ QDF_STATUS wlansap_roam_callback(void *ctx,
 		break;
 	case eCSR_ROAM_RESULT_DEAUTH_IND:
 	case eCSR_ROAM_RESULT_DISASSOC_IND:
-		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
-			  FL("CSR roam_result = eCSR_ROAM_RESULT_DEAUTH/DISASSOC_IND (%d)"),
-			  roam_result);
 		/* Fill in the event structure */
 		qdf_status = sap_signal_hdd_event(sap_ctx, csr_roam_info,
 					eSAP_STA_DISASSOC_EVENT,
@@ -1135,9 +1061,6 @@ QDF_STATUS wlansap_roam_callback(void *ctx,
 			qdf_ret_status = QDF_STATUS_E_FAILURE;
 		break;
 	case eCSR_ROAM_RESULT_MIC_ERROR_GROUP:
-		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
-			  FL("CSR roam_result = eCSR_ROAM_RESULT_MIC_ERROR_GROUP (%d)"),
-			  roam_result);
 		/*
 		 * Fill in the event structure
 		 * TODO: support for group key MIC failure event to be handled
@@ -1149,9 +1072,6 @@ QDF_STATUS wlansap_roam_callback(void *ctx,
 			qdf_ret_status = QDF_STATUS_E_FAILURE;
 		break;
 	case eCSR_ROAM_RESULT_MIC_ERROR_UNICAST:
-		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
-			  FL("CSR roam_result = eCSR_ROAM_RESULT_MIC_ERROR_UNICAST (%d)"),
-			  roam_result);
 		/*
 		 * Fill in the event structure
 		 * TODO: support for unicast key MIC failure event to be handled
@@ -1165,9 +1085,6 @@ QDF_STATUS wlansap_roam_callback(void *ctx,
 		}
 		break;
 	case eCSR_ROAM_RESULT_AUTHENTICATED:
-		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
-			  FL("CSR roam_result = eCSR_ROAM_RESULT_AUTHENTICATED (%d)"),
-			  roam_result);
 		/* Fill in the event structure */
 		sap_signal_hdd_event(sap_ctx, csr_roam_info,
 				  eSAP_STA_SET_KEY_EVENT,
@@ -1176,9 +1093,6 @@ QDF_STATUS wlansap_roam_callback(void *ctx,
 			qdf_ret_status = QDF_STATUS_E_FAILURE;
 		break;
 	case eCSR_ROAM_RESULT_ASSOCIATED:
-		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
-			  FL("CSR roam_result = eCSR_ROAM_RESULT_ASSOCIATED (%d)"),
-			  roam_result);
 		/* Fill in the event structure */
 		sap_signal_hdd_event(sap_ctx, csr_roam_info,
 				     eSAP_STA_REASSOC_EVENT,
@@ -1186,14 +1100,10 @@ QDF_STATUS wlansap_roam_callback(void *ctx,
 		break;
 	case eCSR_ROAM_RESULT_INFRA_STARTED:
 		if (!csr_roam_info) {
-			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
-				  "csr_roam_info is NULL");
+			sap_err("csr_roam_info is NULL");
 			qdf_ret_status = QDF_STATUS_E_NULL_VALUE;
 			break;
 		}
-		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
-			  FL("CSR roam_result = eCSR_ROAM_RESULT_INFRA_STARTED (%d)"),
-			  roam_result);
 		/*
 		 * In the current implementation, hostapd is not aware that
 		 * drive will support DFS. Hence, driver should inform
@@ -1210,9 +1120,6 @@ QDF_STATUS wlansap_roam_callback(void *ctx,
 			qdf_ret_status = QDF_STATUS_E_FAILURE;
 		break;
 	case eCSR_ROAM_RESULT_INFRA_STOPPED:
-		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
-			  FL("CSR roam_result = eCSR_ROAM_RESULT_INFRA_STOPPED (%d)"),
-			  roam_result);
 		/* Fill in the event structure */
 		sap_event.event = eSAP_MAC_READY_FOR_CONNECTIONS;
 		sap_event.params = csr_roam_info;
@@ -1224,9 +1131,6 @@ QDF_STATUS wlansap_roam_callback(void *ctx,
 			qdf_ret_status = QDF_STATUS_E_FAILURE;
 		break;
 	case eCSR_ROAM_RESULT_WPS_PBC_PROBE_REQ_IND:
-		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
-			  FL("CSR roam_result = eCSR_ROAM_RESULT_WPS_PBC_PROBE_REQ_IND (%d)"),
-			  roam_result);
 		/*
 		 * Fill in the event structure
 		 * TODO: support for group key MIC failure event to be handled
@@ -1238,9 +1142,6 @@ QDF_STATUS wlansap_roam_callback(void *ctx,
 			qdf_ret_status = QDF_STATUS_E_FAILURE;
 		break;
 	case eCSR_ROAM_RESULT_FORCED:
-		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
-			  FL("CSR roam_result = eCSR_ROAM_RESULT_FORCED (%d)"),
-			  roam_result);
 		/*
 		 * This event can be used to inform hdd about user triggered
 		 * disassoc event
@@ -1251,9 +1152,6 @@ QDF_STATUS wlansap_roam_callback(void *ctx,
 				     (void *) eSAP_STATUS_SUCCESS);
 		break;
 	case eCSR_ROAM_RESULT_NONE:
-		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
-			  FL("CSR roam_result = eCSR_ROAM_RESULT_NONE (%d)"),
-			  roam_result);
 		/*
 		 * This event can be used to inform hdd about user triggered
 		 * disassoc event
@@ -1265,9 +1163,6 @@ QDF_STATUS wlansap_roam_callback(void *ctx,
 					     (void *) eSAP_STATUS_SUCCESS);
 		break;
 	case eCSR_ROAM_RESULT_MAX_ASSOC_EXCEEDED:
-		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
-			  FL("CSR roam_result = eCSR_ROAM_RESULT_MAX_ASSOC_EXCEEDED (%d)"),
-			  roam_result);
 		/* Fill in the event structure */
 		qdf_status = sap_signal_hdd_event(sap_ctx, csr_roam_info,
 						  eSAP_MAX_ASSOC_EXCEEDED,
@@ -1287,8 +1182,7 @@ QDF_STATUS wlansap_roam_callback(void *ctx,
 		qdf_ret_status = wlansap_dfs_send_csa_ie_request(sap_ctx);
 
 		if (!QDF_IS_STATUS_SUCCESS(qdf_ret_status))
-			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
-				  FL("CSR roam_result = eCSR_ROAM_RESULT_CSA_RESTART_RSP %d"),
+			sap_debug("CSR roam_result = eCSR_ROAM_RESULT_CSA_RESTART_RSP %d",
 				  roam_result);
 		break;
 	case eCSR_ROAM_RESULT_DFS_CHANSW_UPDATE_SUCCESS:
@@ -1332,10 +1226,9 @@ QDF_STATUS wlansap_roam_callback(void *ctx,
 			qdf_ret_status = QDF_STATUS_E_FAILURE;
 		break;
 	default:
-		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
-			  FL("CSR roam_result = %s (%d) not handled"),
-			  get_e_csr_roam_result_str(roam_result),
-			  roam_result);
+		sap_err("CSR roam_result = %s (%d) not handled",
+			 get_e_csr_roam_result_str(roam_result),
+			 roam_result);
 		break;
 	}
 EXIT:
@@ -1372,8 +1265,7 @@ void sap_scan_event_callback(struct wlan_objmgr_vdev *vdev,
 	scan_id = event->scan_id;
 	mac_handle = cds_get_context(QDF_MODULE_ID_SME);
 	if (!mac_handle) {
-		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_FATAL,
-			  FL("invalid MAC handle"));
+		sap_alert("invalid MAC handle");
 		return;
 	}
 

core/sap/src/sap_ch_select.c

@@ -457,9 +457,7 @@ static bool sap_chan_sel_init(mac_handle_t mac_handle,
 		if (sap_dfs_is_channel_in_nol_list(
 					sap_ctx, channel,
 					PHY_SINGLE_CHANNEL_CENTERED)) {
-			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
-				  "In %s, Ch %d is in NOL list", __func__,
-				  channel);
+			sap_debug("Ch %d is in NOL list", channel);
 			continue;
 		}
 
@@ -467,11 +465,9 @@ static bool sap_chan_sel_init(mac_handle_t mac_handle,
 		    sta_sap_scc_on_dfs_chnl_config_value == 1) {
 			if (wlan_reg_is_dfs_for_freq(mac->pdev,
 						     pSpectCh->chan_freq)) {
-				QDF_TRACE(QDF_MODULE_ID_SAP,
-					  QDF_TRACE_LEVEL_INFO_HIGH,
-					  "In %s, DFS Ch %d not considered for ACS. include_dfs_ch %u, sta_sap_scc_on_dfs_chnl_config_value %d",
-					  __func__, channel, include_dfs_ch,
-					  sta_sap_scc_on_dfs_chnl_config_value);
+				sap_debug("DFS Ch %d not considered for ACS. include_dfs_ch %u, sta_sap_scc_on_dfs_chnl_config_value %d",
+					channel, include_dfs_ch,
+					sta_sap_scc_on_dfs_chnl_config_value);
 				continue;
 			}
 		}
@@ -560,8 +556,7 @@ uint32_t sapweight_rssi_count(struct sap_context *sap_ctx, int8_t rssi,
 
 	rssicountWeight = rssiWeight + countWeight;
 
-	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "rssiWeight=%d, countWeight=%d, rssicountWeight=%d",
+	sap_debug("rssiWeight=%d, countWeight=%d, rssicountWeight=%d",
 		  rssiWeight, countWeight, rssicountWeight);
 
 	return rssicountWeight;
@@ -628,8 +623,7 @@ static uint32_t sap_weight_channel_noise_floor(struct sap_context *sap_ctx,
 	if (noise_floor_weight > softap_nf_weight_local)
 		noise_floor_weight = softap_nf_weight_local;
 
-	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "nf=%d, nfwc=%d, nfwl=%d, nfw=%d",
+	sap_debug("nf=%d, nfwc=%d, nfwl=%d, nfw=%d",
 		  channel_stat->noise_floor,
 		  softap_nf_weight_cfg, softap_nf_weight_local,
 		  noise_floor_weight);
@@ -684,8 +678,7 @@ static uint32_t sap_weight_channel_free(struct sap_context *sap_ctx,
 	if (channel_free_weight > softap_channel_free_weight_local)
 		channel_free_weight = softap_channel_free_weight_local;
 
-	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "rcc=%d, cc=%d, tc=%d, rc=%d, cfwc=%d, cfwl=%d, cfw=%d",
+	sap_debug("rcc=%d, cc=%d, tc=%d, rc=%d, cfwc=%d, cfwl=%d, cfw=%d",
 		  rx_clear_count, cycle_count,
 		  channel_stat->tx_frame_count,
 		  channel_stat->rx_frame_count,
@@ -734,8 +727,7 @@ static uint32_t sap_weight_channel_txpwr_range(struct sap_context *sap_ctx,
 	if (txpwr_weight_low_speed > softap_txpwr_range_weight_local)
 		txpwr_weight_low_speed = softap_txpwr_range_weight_local;
 
-	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "tpr=%d, tprwc=%d, tprwl=%d, tprw=%d",
+	sap_debug("tpr=%d, tprwc=%d, tprwl=%d, tprw=%d",
 		  channel_stat->chan_tx_pwr_range,
 		  softap_txpwr_range_weight_cfg,
 		  softap_txpwr_range_weight_local,
@@ -782,8 +774,7 @@ static uint32_t sap_weight_channel_txpwr_tput(struct sap_context *sap_ctx,
 	if (txpwr_weight_high_speed > softap_txpwr_tput_weight_local)
 		txpwr_weight_high_speed = softap_txpwr_tput_weight_local;
 
-	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "tpt=%d, tptwc=%d, tptwl=%d, tptw=%d",
+	sap_debug("tpt=%d, tptwc=%d, tptwl=%d, tptw=%d",
 		  channel_stat->chan_tx_pwr_throughput,
 		  softap_txpwr_tput_weight_cfg,
 		  softap_txpwr_tput_weight_local,
@@ -1034,8 +1025,7 @@ static void sap_interference_rssi_count(tSapSpectChInfo *spect_ch,
 	tSapSpectChInfo *spectch_end)
 {
 	if (!spect_ch) {
-		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
-			  "%s: spect_ch is NULL", __func__);
+		sap_err("spect_ch is NULL");
 		return;
 	}
 
@@ -1297,8 +1287,7 @@ static void sap_compute_spect_weight(tSapChSelSpectInfo *pSpectInfoParams,
 				mac->mlme_cfg->acs.normalize_weight_range;
 	bool freq_present_in_list = false;
 
-	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "In %s, Computing spectral weight", __func__);
+	sap_debug("Computing spectral weight");
 
 	if (scan_list)
 		qdf_list_peek_front(scan_list, &cur_lst);
@@ -2247,8 +2236,7 @@ uint32_t sap_select_channel(mac_handle_t mac_handle,
 
 	/* Initialize the structure pointed by spect_info */
 	if (sap_chan_sel_init(mac_handle, spect_info, sap_ctx) != true) {
-		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
-			  FL("Ch Select initialization failed"));
+		sap_err("Ch Select initialization failed");
 		return SAP_CHANNEL_NOT_SELECTED;
 	}
 

core/sap/src/sap_module.c

@@ -246,13 +246,13 @@ static void wlansap_owe_cleanup(struct sap_context *sap_ctx)
 	QDF_STATUS status;
 
 	if (!sap_ctx) {
-		QDF_TRACE_ERROR(QDF_MODULE_ID_SAP, "Invalid SAP context");
+		sap_err("Invalid SAP context");
 		return;
 	}
 
 	mac = sap_get_mac_context();
 	if (!mac) {
-		QDF_TRACE_ERROR(QDF_MODULE_ID_SAP, "Invalid MAC context");
+		sap_err("Invalid MAC context");
 		return;
 	}
 
@@ -280,8 +280,7 @@ static void wlansap_owe_cleanup(struct sap_context *sap_ctx)
 			status = sme_update_owe_info(mac, assoc_ind);
 			qdf_mem_free(assoc_ind);
 		} else {
-			QDF_TRACE_ERROR(QDF_MODULE_ID_SAP,
-					"Failed to remove assoc ind");
+			sap_err("Failed to remove assoc ind");
 		}
 		node = next_node;
 		next_node = NULL;
@@ -300,8 +299,7 @@ QDF_STATUS sap_init_ctx(struct sap_context *sap_ctx,
 	QDF_STATUS status;
 	struct mac_context *mac;
 
-	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "wlansap_start invoked successfully");
+	sap_debug("wlansap_start invoked successfully");
 
 	if (!sap_ctx) {
 		sap_err("Invalid SAP pointer");
@@ -328,7 +326,7 @@ QDF_STATUS sap_init_ctx(struct sap_context *sap_ctx,
 
 	mac = sap_get_mac_context();
 	if (!mac) {
-		QDF_TRACE_ERROR(QDF_MODULE_ID_SAP, "Invalid MAC context");
+		sap_err("Invalid MAC context");
 		return QDF_STATUS_E_INVAL;
 	}
 
@@ -346,8 +344,7 @@ QDF_STATUS sap_init_ctx(struct sap_context *sap_ctx,
 	if (!reinit) {
 		status = wlansap_owe_init(sap_ctx);
 		if (QDF_STATUS_SUCCESS != status) {
-			QDF_TRACE_ERROR(QDF_MODULE_ID_SAP,
-					"OWE init failed");
+			sap_err("OWE init failed");
 			return QDF_STATUS_E_FAILURE;
 		}
 	}
@@ -372,7 +369,7 @@ QDF_STATUS sap_deinit_ctx(struct sap_context *sap_ctx)
 
 	mac = sap_get_mac_context();
 	if (!mac) {
-		QDF_TRACE_ERROR(QDF_MODULE_ID_SAP, "Invalid MAC context");
+		sap_err("Invalid MAC context");
 		return QDF_STATUS_E_FAULT;
 	}
 	ucfg_scan_unregister_requester(mac->psoc, sap_ctx->req_id);
@@ -394,8 +391,7 @@ QDF_STATUS sap_deinit_ctx(struct sap_context *sap_ctx)
 
 QDF_STATUS sap_destroy_ctx(struct sap_context *sap_ctx)
 {
-	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
-		  FL("Enter"));
+	sap_debug("Enter");
 
 	if (!sap_ctx) {
 		sap_err("Invalid SAP pointer");
@@ -416,8 +412,7 @@ bool wlansap_is_channel_in_nol_list(struct sap_context *sap_ctx,
 				    ePhyChanBondState chanBondState)
 {
 	if (!sap_ctx) {
-		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
-			  "%s: Invalid SAP pointer from pCtx", __func__);
+		sap_err("Invalid SAP pointer from pCtx");
 		return QDF_STATUS_E_FAULT;
 	}
 
@@ -444,7 +439,7 @@ bool wlansap_is_channel_leaking_in_nol(struct sap_context *sap_ctx,
 	leakage_adjusted_lst[0] = channel;
 	mac_ctx = sap_get_mac_context();
 	if (!mac_ctx) {
-		QDF_TRACE_ERROR(QDF_MODULE_ID_SAP, "Invalid MAC context");
+		sap_err("Invalid MAC context");
 		return QDF_STATUS_E_FAULT;
 	}
 	if (QDF_IS_STATUS_ERROR(wlansap_mark_leaking_channel(mac_ctx->pdev,
@@ -466,7 +461,7 @@ uint16_t wlansap_check_cc_intf(struct sap_context *sap_ctx)
 
 	mac = sap_get_mac_context();
 	if (!mac) {
-		QDF_TRACE_ERROR(QDF_MODULE_ID_SAP, "Invalid MAC context");
+		sap_err("Invalid MAC context");
 		return 0;
 	}
 	phy_mode = sap_ctx->csr_roamProfile.phyMode;
@@ -638,9 +633,7 @@ void wlan_sap_set_sap_ctx_acs_cfg(struct sap_context *sap_ctx,
 				  struct sap_config *sap_config)
 {
 	if (!sap_ctx) {
-		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
-			  "%s: Invalid SAP pointer",
-			  __func__);
+		sap_err("Invalid SAP pointer");
 		return;
 	}
 
@@ -819,12 +812,10 @@ QDF_STATUS wlansap_set_mac_acl(struct sap_context *sap_ctx,
 {
 	QDF_STATUS qdf_status = QDF_STATUS_SUCCESS;
 
-	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "wlansap_set_mac_acl");
+	sap_debug("wlansap_set_mac_acl");
 
 	if (!sap_ctx) {
-		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
-			  "%s: Invalid SAP pointer", __func__);
+		sap_err("Invalid SAP pointer");
 		return QDF_STATUS_E_FAULT;
 	}
 	/* Copy MAC filtering settings to sap context */
@@ -967,15 +958,12 @@ QDF_STATUS wlansap_modify_acl(struct sap_context *sap_ctx,
 			QDF_MAC_ADDR_REF(peer_sta_mac));
 		return QDF_STATUS_E_FAULT;
 	}
-	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_LOW,
-		  "Modify ACL entered\n" "Before modification of ACL\n"
+	sap_debug("Modify ACL entered\n" "Before modification of ACL\n"
 		  "size of accept and deny lists %d %d", sap_ctx->nAcceptMac,
 		  sap_ctx->nDenyMac);
-	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "*** WHITE LIST ***");
+	sap_debug("*** WHITE LIST ***");
 	sap_print_acl(sap_ctx->acceptMacList, sap_ctx->nAcceptMac);
-	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "*** BLACK LIST ***");
+	sap_debug("*** BLACK LIST ***");
 	sap_print_acl(sap_ctx->denyMacList, sap_ctx->nDenyMac);
 
 	/* the expectation is a mac addr will not be in both the lists
@@ -997,8 +985,7 @@ QDF_STATUS wlansap_modify_acl(struct sap_context *sap_ctx,
 		return QDF_STATUS_E_FAILURE;
 
 	}
-	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_LOW,
-		  "cmd %d", cmd);
+	sap_debug("cmd %d", cmd);
 
 	switch (list_type) {
 	case eSAP_WHITE_LIST:
@@ -1029,11 +1016,9 @@ QDF_STATUS wlansap_modify_acl(struct sap_context *sap_ctx,
 			sap_add_mac_to_acl(sap_ctx->acceptMacList,
 					       &sap_ctx->nAcceptMac,
 			       peer_sta_mac);
-				QDF_TRACE(QDF_MODULE_ID_SAP,
-				  QDF_TRACE_LEVEL_INFO_LOW,
-				  "size of accept and deny lists %d %d",
-				  sap_ctx->nAcceptMac,
-				  sap_ctx->nDenyMac);
+				sap_debug("size of accept and deny lists %d %d",
+					  sap_ctx->nAcceptMac,
+					  sap_ctx->nDenyMac);
 		} else if (cmd == DELETE_STA_FROM_ACL) {
 			if (sta_white_list) {
 
@@ -1049,9 +1034,7 @@ QDF_STATUS wlansap_modify_acl(struct sap_context *sap_ctx,
 					SIR_MAC_MGMT_DEAUTH,
 					&delStaParams);
 				wlansap_deauth_sta(sap_ctx, &delStaParams);
-				QDF_TRACE(QDF_MODULE_ID_SAP,
-					  QDF_TRACE_LEVEL_INFO_LOW,
-					  "size of accept and deny lists %d %d",
+				sap_debug("size of accept and deny lists %d %d",
 					  sap_ctx->nAcceptMac,
 					  sap_ctx->nDenyMac);
 			} else {
@@ -1101,9 +1084,7 @@ QDF_STATUS wlansap_modify_acl(struct sap_context *sap_ctx,
 			sap_info("... Now add to black list");
 			sap_add_mac_to_acl(sap_ctx->denyMacList,
 				       &sap_ctx->nDenyMac, peer_sta_mac);
-			QDF_TRACE(QDF_MODULE_ID_SAP,
-				  QDF_TRACE_LEVEL_INFO_LOW,
-				  "size of accept and deny lists %d %d",
+			sap_debug("size of accept and deny lists %d %d",
 				  sap_ctx->nAcceptMac,
 				  sap_ctx->nDenyMac);
 		} else if (cmd == DELETE_STA_FROM_ACL) {
@@ -1112,9 +1093,7 @@ QDF_STATUS wlansap_modify_acl(struct sap_context *sap_ctx,
 				sap_remove_mac_from_acl(sap_ctx->denyMacList,
 						    &sap_ctx->nDenyMac,
 						    staBLIndex);
-				QDF_TRACE(QDF_MODULE_ID_SAP,
-					  QDF_TRACE_LEVEL_INFO_LOW,
-					  "no accept and deny mac %d %d",
+				sap_debug("no accept and deny mac %d %d",
 					  sap_ctx->nAcceptMac,
 					  sap_ctx->nDenyMac);
 			} else {
@@ -1135,13 +1114,10 @@ QDF_STATUS wlansap_modify_acl(struct sap_context *sap_ctx,
 		return QDF_STATUS_E_FAILURE;
 	}
 	}
-	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_LOW,
-		  "After modification of ACL");
-	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "*** WHITE LIST ***");
+	sap_debug("After modification of ACL");
+	sap_debug("*** WHITE LIST ***");
 	sap_print_acl(sap_ctx->acceptMacList, sap_ctx->nAcceptMac);
-	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "*** BLACK LIST ***");
+	sap_debug("*** BLACK LIST ***");
 	sap_print_acl(sap_ctx->denyMacList, sap_ctx->nDenyMac);
 	return QDF_STATUS_SUCCESS;
 }
@@ -1158,7 +1134,7 @@ QDF_STATUS wlansap_disassoc_sta(struct sap_context *sap_ctx,
 
 	mac = sap_get_mac_context();
 	if (!mac) {
-		QDF_TRACE_ERROR(QDF_MODULE_ID_SAP, "Invalid MAC context");
+		sap_err("Invalid MAC context");
 		return QDF_STATUS_E_FAULT;
 	}
 
@@ -1178,7 +1154,7 @@ QDF_STATUS wlansap_deauth_sta(struct sap_context *sap_ctx,
 
 	mac = sap_get_mac_context();
 	if (!mac) {
-		QDF_TRACE_ERROR(QDF_MODULE_ID_SAP, "Invalid MAC context");
+		sap_err("Invalid MAC context");
 		return QDF_STATUS_E_FAULT;
 	}
 
@@ -1356,7 +1332,7 @@ QDF_STATUS wlansap_set_channel_change_with_csa(struct sap_context *sap_ctx,
 
 	mac = sap_get_mac_context();
 	if (!mac) {
-		QDF_TRACE_ERROR(QDF_MODULE_ID_SAP, "Invalid MAC context");
+		sap_err("Invalid MAC context");
 		return QDF_STATUS_E_FAULT;
 	}
 	mac_handle = MAC_HANDLE(mac);
@@ -1621,8 +1597,7 @@ bool wlan_sap_is_pre_cac_active(mac_handle_t handle)
 
 	mac = MAC_CONTEXT(handle);
 	if (!mac) {
-		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
-			"%s: Invalid mac context", __func__);
+		sap_err("Invalid mac context");
 		return false;
 	}
 
@@ -1651,8 +1626,7 @@ QDF_STATUS wlan_sap_get_pre_cac_vdev_id(mac_handle_t handle, uint8_t *vdev_id)
 
 	mac = MAC_CONTEXT(handle);
 	if (!mac) {
-		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
-			"%s: Invalid mac context", __func__);
+		sap_err("Invalid mac context");
 		return QDF_STATUS_E_FAULT;
 	}
 
@@ -1768,7 +1742,7 @@ QDF_STATUS wlansap_channel_change_request(struct sap_context *sap_ctx,
 
 	mac_ctx = sap_get_mac_context();
 	if (!mac_ctx) {
-		QDF_TRACE_ERROR(QDF_MODULE_ID_SAP, "Invalid MAC context");
+		sap_err("Invalid MAC context");
 		return QDF_STATUS_E_FAULT;
 	}
 
@@ -1838,7 +1812,7 @@ QDF_STATUS wlansap_start_beacon_req(struct sap_context *sap_ctx)
 
 	mac = sap_get_mac_context();
 	if (!mac) {
-		QDF_TRACE_ERROR(QDF_MODULE_ID_SAP, "Invalid MAC context");
+		sap_err("Invalid MAC context");
 		return QDF_STATUS_E_FAULT;
 	}
 
@@ -1866,7 +1840,7 @@ QDF_STATUS wlansap_dfs_send_csa_ie_request(struct sap_context *sap_ctx)
 
 	mac = sap_get_mac_context();
 	if (!mac) {
-		QDF_TRACE_ERROR(QDF_MODULE_ID_SAP, "Invalid MAC context");
+		sap_err("Invalid MAC context");
 		return QDF_STATUS_E_FAULT;
 	}
 
@@ -2020,10 +1994,7 @@ wlansap_set_dfs_preferred_channel_location(mac_handle_t mac_handle)
 	if (DFS_MKK_REGION == dfs_region) {
 		mac->sap.SapDfsInfo.sap_operating_chan_preferred_location =
 			dfs_preferred_channels_location;
-		QDF_TRACE(QDF_MODULE_ID_SAP,
-			  QDF_TRACE_LEVEL_INFO_LOW,
-			  FL
-				  ("sapdfs:Set Preferred Operating Channel location=%d"),
+		sap_debug("sapdfs:Set Preferred Operating Channel location=%d",
 			  mac->sap.SapDfsInfo.
 			  sap_operating_chan_preferred_location);
 
@@ -2349,7 +2320,7 @@ QDF_STATUS wlansap_set_dfs_nol(struct sap_context *sap_ctx,
 
 	mac = sap_get_mac_context();
 	if (!mac) {
-		QDF_TRACE_ERROR(QDF_MODULE_ID_SAP, "Invalid MAC context");
+		sap_err("Invalid MAC context");
 		return QDF_STATUS_E_FAULT;
 	}
 
@@ -2450,7 +2421,7 @@ QDF_STATUS wlansap_acs_chselect(struct sap_context *sap_context,
 
 	mac = sap_get_mac_context();
 	if (!mac) {
-		QDF_TRACE_ERROR(QDF_MODULE_ID_SAP, "Invalid MAC context");
+		sap_err("Invalid MAC context");
 		return QDF_STATUS_E_FAULT;
 	}
 
@@ -2588,7 +2559,7 @@ void wlansap_cleanup_cac_timer(struct sap_context *sap_ctx)
 
 	mac = sap_get_mac_context();
 	if (!mac) {
-		QDF_TRACE_ERROR(QDF_MODULE_ID_SAP, "Invalid MAC context");
+		sap_err("Invalid MAC context");
 		return;
 	}
 
@@ -2615,7 +2586,7 @@ static int wlansap_validate_owe_ie(const uint8_t *ie, uint32_t remaining_ie_len)
 	uint8_t ie_id, ie_len, ie_ext_id = 0;
 
 	if (remaining_ie_len < 2) {
-		QDF_TRACE_ERROR(QDF_MODULE_ID_SAP, "IE too short");
+		sap_err("IE too short");
 		return -EINVAL;
 	}
 
@@ -2630,8 +2601,7 @@ static int wlansap_validate_owe_ie(const uint8_t *ie, uint32_t remaining_ie_len)
 	case DOT11F_EID_RSN:
 		if (ie_len < DOT11F_IE_RSN_MIN_LEN ||
 		    ie_len > DOT11F_IE_RSN_MAX_LEN) {
-			QDF_TRACE_ERROR(QDF_MODULE_ID_SAP,
-					"Invalid RSN IE len %d", ie_len);
+			sap_err("Invalid RSN IE len %d", ie_len);
 			return -EINVAL;
 		}
 		ie_len += 2;
@@ -2639,25 +2609,23 @@ static int wlansap_validate_owe_ie(const uint8_t *ie, uint32_t remaining_ie_len)
 	case DOT11F_EID_DH_PARAMETER_ELEMENT:
 		ie_ext_id = ie[2];
 		if (ie_ext_id != DH_OUI_TYPE) {
-			QDF_TRACE_ERROR(QDF_MODULE_ID_SAP,
-					"Invalid DH IE ID %d", ie_ext_id);
+			sap_err("Invalid DH IE ID %d", ie_ext_id);
 			return -EINVAL;
 		}
 		if (ie_len < DOT11F_IE_DH_PARAMETER_ELEMENT_MIN_LEN ||
 		    ie_len > DOT11F_IE_DH_PARAMETER_ELEMENT_MAX_LEN) {
-			QDF_TRACE_ERROR(QDF_MODULE_ID_SAP,
-					"Invalid DH IE len %d", ie_len);
+			sap_err("Invalid DH IE len %d", ie_len);
 			return -EINVAL;
 		}
 		ie_len += 2;
 		break;
 	default:
-		QDF_TRACE_ERROR(QDF_MODULE_ID_SAP, "Invalid IE %d", ie_id);
+		sap_err("Invalid IE %d", ie_id);
 		return -EINVAL;
 	}
 
 	if (ie_len > remaining_ie_len) {
-		QDF_TRACE_ERROR(QDF_MODULE_ID_SAP, "Invalid IE len");
+		sap_err("Invalid IE len");
 		return -EINVAL;
 	}
 
@@ -2703,26 +2671,25 @@ QDF_STATUS wlansap_update_owe_info(struct sap_context *sap_ctx,
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 
 	if (!wlansap_validate_owe_ies(ie, ie_len)) {
-		QDF_TRACE_ERROR(QDF_MODULE_ID_SAP, "Invalid OWE IE");
+		sap_err("Invalid OWE IE");
 		return QDF_STATUS_E_FAULT;
 	}
 
 	if (!sap_ctx) {
-		QDF_TRACE_ERROR(QDF_MODULE_ID_SAP, "Invalid SAP context");
+		sap_err("Invalid SAP context");
 		return QDF_STATUS_E_FAULT;
 	}
 
 	mac = sap_get_mac_context();
 	if (!mac) {
-		QDF_TRACE_ERROR(QDF_MODULE_ID_SAP, "Invalid MAC context");
+		sap_err("Invalid MAC context");
 		return QDF_STATUS_E_FAULT;
 	}
 
 	if (QDF_STATUS_SUCCESS !=
 		qdf_list_peek_front(&sap_ctx->owe_pending_assoc_ind_list,
 				    &next_node)) {
-		QDF_TRACE_ERROR(QDF_MODULE_ID_SAP,
-				"Failed to find assoc ind list");
+		sap_err("Failed to find assoc ind list");
 		return QDF_STATUS_E_FAILURE;
 	}
 
@@ -2737,8 +2704,7 @@ QDF_STATUS wlansap_update_owe_info(struct sap_context *sap_ctx,
 					   &sap_ctx->owe_pending_assoc_ind_list,
 					   node);
 			if (status != QDF_STATUS_SUCCESS) {
-				QDF_TRACE_ERROR(QDF_MODULE_ID_SAP,
-						"Failed to remove assoc ind");
+				sap_err("Failed to remove assoc ind");
 				return status;
 			}
 			assoc_ind = owe_assoc_ind->assoc_ind;