qcacld-3.0: Remove sms_log() & obsolete file 'sms_debug.h'

Remove sms_log() and obsolete file 'sms_debug.h'.

Change-Id: Ibdb25674c1efa6b53262f3aaaf3ff7c8744f28b8
CRs-Fixed: 2020798

core/sme/inc/sms_debug.h

@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 2011, 2013-2015 The Linux Foundation. All rights reserved.
- *
- * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
- *
- *
- * Permission to use, copy, modify, and/or distribute this software for
- * any purpose with or without fee is hereby granted, provided that the
- * above copyright notice and this permission notice appear in all
- * copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
- * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-/*
- * This file was originally distributed by Qualcomm Atheros, Inc.
- * under proprietary terms before Copyright ownership was assigned
- * to the Linux Foundation.
- */
-
-/**
- * \file cssDebug.h
- *
- * Define debug log interface for SMS.
- */
-
-#ifndef SMS_DEBUG_H__
-#define SMS_DEBUG_H__
-
-#include "utils_api.h"
-#include "sir_debug.h"
-
-#if !defined(__printf)
-#define __printf(a, b)
-#endif
-
-void __printf(3, 4)
-	sms_log(tpAniSirGlobal pMac, uint32_t loglevel,
-			const char *pString, ...);
-
-#endif /* __SMS_DEBUG_H__ */

core/sme/src/common/sme_api.c

@@ -37,7 +37,8 @@
    Include Files
    ------------------------------------------------------------------------*/
 
-#include "sms_debug.h"
+#include <sir_common.h>
+#include <ani_global.h>
 #include "sme_api.h"
 #include "csr_inside_api.h"
 #include "sme_inside.h"
@@ -64,8 +65,6 @@
 #include "wlan_reg_services_api.h"
 #include <wlan_scan_ucfg_api.h>
 
-#define LOG_SIZE 256
-
 static tSelfRecoveryStats g_self_recovery_stats;
 
 static QDF_STATUS init_sme_cmd_list(tpAniSirGlobal pMac);
@@ -237,8 +236,7 @@ static QDF_STATUS sme_process_set_hw_mode_resp(tpAniSirGlobal mac, uint8_t *msg)
 			csr_scan_handle_search_for_ssid(mac,
 					saved_cmd);
 		} else {
-			sms_log(mac, LOG1,
-					FL("search for ssid failure"));
+			sme_debug("search for ssid failure");
 			csr_scan_handle_search_for_ssid_failure(mac,
 					saved_cmd);
 		}
@@ -261,13 +259,11 @@ static QDF_STATUS sme_process_set_hw_mode_resp(tpAniSirGlobal mac, uint8_t *msg)
 		}
 #else
 		if (param->status == SET_HW_MODE_STATUS_OK) {
-			sms_log(mac, LOG1,
-					FL("search for ssid success"));
+			sme_debug("search for ssid success");
 			csr_scan_handle_search_for_ssid(mac,
 					session_id);
 		} else {
-			sms_log(mac, LOG1,
-					FL("search for ssid failure"));
+			sme_debug("search for ssid failure");
 			csr_scan_handle_search_for_ssid_failure(mac,
 					session_id);
 		}
@@ -560,19 +556,19 @@ QDF_STATUS sme_ser_handle_active_cmd(struct wlan_serialization_command *cmd)
 	bool do_continue;
 
 	if (!cmd) {
-		sms_log(mac_ctx, LOGE, FL("No serialization command found"));
+		sme_err("No serialization command found");
 		return QDF_STATUS_E_FAILURE;
 	}
 
 	hal = cds_get_context(QDF_MODULE_ID_SME);
 	mac_ctx = PMAC_STRUCT(hal);
 	if (!mac_ctx) {
-		sms_log(mac_ctx, LOGE, FL("No mac_ctx found"));
+		sme_err("No mac_ctx found");
 		return QDF_STATUS_E_FAILURE;
 	}
 	sme_cmd = cmd->umac_cmd;
 	if (!sme_cmd) {
-		sms_log(mac_ctx, LOGE, FL("No SME command found"));
+		sme_err("No SME command found");
 		return QDF_STATUS_E_FAILURE;
 	}
 
@@ -597,7 +593,7 @@ QDF_STATUS sme_ser_handle_active_cmd(struct wlan_serialization_command *cmd)
 		status = csr_process_ndp_data_end_request(mac_ctx, sme_cmd);
 		break;
 	case eSmeCommandScan:
-		sms_log(mac_ctx, LOG1, FL("Processing scan offload cmd."));
+		sme_debug("Processing scan offload cmd");
 		qdf_mc_timer_start(&sme_cmd->u.scanCmd.csr_scan_timer,
 				CSR_ACTIVE_SCAN_LIST_CMD_TIMEOUT);
 		status = csr_process_scan_command(mac_ctx, sme_cmd);
@@ -647,7 +643,7 @@ QDF_STATUS sme_ser_handle_active_cmd(struct wlan_serialization_command *cmd)
 		break;
 	}
 	if (!QDF_IS_STATUS_SUCCESS(status)) {
-		sms_log(mac_ctx, LOGE, FL("Releasing memory for %d"),
+		sme_err("Releasing memory for %d",
 			sme_cmd->command);
 		csr_release_command(mac_ctx, sme_cmd);
 	}
@@ -666,7 +662,7 @@ QDF_STATUS sme_ser_cmd_callback(void *buf,
 	hal = cds_get_context(QDF_MODULE_ID_SME);
 	mac_ctx = PMAC_STRUCT(hal);
 	if (!mac_ctx) {
-		sms_log(mac_ctx, LOGE, FL("mac_ctx is null"));
+		sme_err("mac_ctx is null");
 		return QDF_STATUS_E_FAILURE;
 	}
 	/*
@@ -674,34 +670,30 @@ QDF_STATUS sme_ser_cmd_callback(void *buf,
 	 * caller or MC thread context
 	 */
 	if (!cmd) {
-		sms_log(mac_ctx, LOGE, FL("serialization command is null"));
+		sme_err("serialization command is null");
 		return QDF_STATUS_E_FAILURE;
 	}
 
 	switch (reason) {
 	case WLAN_SER_CB_ACTIVATE_CMD:
-		sms_log(mac_ctx, LOG1,
-			FL("WLAN_SER_CB_ACTIVATE_CMD callback"));
+		sme_debug("WLAN_SER_CB_ACTIVATE_CMD callback");
 		status = sme_ser_handle_active_cmd(cmd);
 		break;
 	case WLAN_SER_CB_CANCEL_CMD:
-		sms_log(mac_ctx, LOG1,
-			FL("WLAN_SER_CB_CANCEL_CMD callback"));
+		sme_debug("WLAN_SER_CB_CANCEL_CMD callback");
 		sme_cmd = cmd->umac_cmd;
 		csr_cancel_command(mac_ctx, sme_cmd);
 		break;
 	case WLAN_SER_CB_RELEASE_MEM_CMD:
-		sms_log(mac_ctx, LOG1,
-			FL("WLAN_SER_CB_RELEASE_MEM_CMD callback"));
+		sme_debug("WLAN_SER_CB_RELEASE_MEM_CMD callback");
 		sme_cmd = cmd->umac_cmd;
 		csr_release_command_buffer(mac_ctx, sme_cmd);
 		break;
 	case WLAN_SER_CB_ACTIVE_CMD_TIMEOUT:
-		sms_log(mac_ctx, LOG1,
-			FL("WLAN_SER_CB_ACTIVE_CMD_TIMEOUT callback"));
+		sme_debug("WLAN_SER_CB_ACTIVE_CMD_TIMEOUT callback");
 		break;
 	default:
-		sms_log(mac_ctx, LOG1, FL("STOP: unknown reason code"));
+		sme_debug("STOP: unknown reason code");
 		return QDF_STATUS_E_FAILURE;
 	}
 	return status;
@@ -972,8 +964,6 @@ QDF_STATUS sme_set_reg_info(tHalHandle hHal, uint8_t *apCntryCode)
 	QDF_STATUS status = QDF_STATUS_E_FAILURE;
 	int32_t ctry_val;
 
-	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
-
 	MTRACE(qdf_trace(QDF_MODULE_ID_SME,
 			 TRACE_CODE_SME_RX_HDD_MSG_SET_REGINFO, NO_SESSION, 0));
 	if (NULL == apCntryCode) {
@@ -983,7 +973,7 @@ QDF_STATUS sme_set_reg_info(tHalHandle hHal, uint8_t *apCntryCode)
 
 	ctry_val = cds_get_country_from_alpha2(apCntryCode);
 	if (ctry_val == CTRY_DEFAULT) {
-		sms_log(pMac, LOGE, "invalid AP alpha2");
+		sme_err("invalid AP alpha2");
 		return  status;
 	}
 
@@ -1151,8 +1141,7 @@ static void sme_update_scan_roam_params(tpAniSirGlobal mac_ctx)
 
 	status = ucfg_scan_update_roam_params(mac_ctx->psoc, &scan_params);
 	if (QDF_IS_STATUS_ERROR(status))
-		sms_log(mac_ctx, LOGE,
-			"ailed to update scan roam params with status=%d",
+		sme_err("ailed to update scan roam params with status=%d",
 			status);
 }
 
@@ -1410,8 +1399,7 @@ QDF_STATUS sme_start(tHalHandle hHal)
 		sme_cbacks.sme_scan_result_purge = sme_scan_result_purge;
 		status = policy_mgr_register_sme_cb(pMac->psoc, &sme_cbacks);
 		if (!QDF_IS_STATUS_SUCCESS(status)) {
-			sms_log(pMac, LOGE,
-				"Failed to register sme cb with Policy Manager: %d",
+			sme_err("Failed to register sme cb with Policy Manager: %d",
 				status);
 			break;
 		}
@@ -5506,17 +5494,6 @@ QDF_STATUS sme_neighbor_report_request(tHalHandle hHal, uint8_t sessionId,
 	return status;
 }
 
-void sms_log(tpAniSirGlobal pMac, uint32_t loglevel, const char *pString, ...)
-{
-#ifdef WLAN_DEBUG
-	va_list marker;
-
-	va_start(marker, pString);
-	log_debug(pMac, SIR_SMS_MODULE_ID, loglevel, pString, marker);
-	va_end(marker);
-#endif
-}
-
 /* ---------------------------------------------------------------------------
     \fn sme_get_wcnss_wlan_compiled_version
     \brief  This API returns the version of the WCNSS WLAN API with
@@ -9834,14 +9811,14 @@ QDF_STATUS sme_get_link_speed(tHalHandle hHal, tSirLinkSpeedInfo *lsReq,
 	pMac = PMAC_STRUCT(hHal);
 	req = qdf_mem_malloc(sizeof(*req));
 	if (!req) {
-		sms_log(pMac, LOGP, FL("Failed to allocate memory"));
+		sme_err("Failed to allocate memory");
 		return QDF_STATUS_E_NOMEM;
 	}
 	*req = *lsReq;
 
 	status = sme_acquire_global_lock(&pMac->sme);
 	if (QDF_STATUS_SUCCESS != status) {
-		sms_log(pMac, LOGP, FL("Failed to acquire global lock"));
+		sme_err("Failed to acquire global lock");
 		qdf_mem_free(req);
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -9855,8 +9832,7 @@ QDF_STATUS sme_get_link_speed(tHalHandle hHal, tSirLinkSpeedInfo *lsReq,
 	status = scheduler_post_msg(QDF_MODULE_ID_WMA, &message);
 	sme_release_global_lock(&pMac->sme);
 	if (!QDF_IS_STATUS_SUCCESS(status)) {
-		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
-			  "%s: Post Link Speed msg fail", __func__);
+		sme_err("%s: Post Link Speed msg fail", __func__);
 		qdf_mem_free(req);
 	}
 
@@ -9874,8 +9850,7 @@ void sme_update_enable_ssr(tHalHandle hHal, bool enableSSR)
 
 	status = sme_acquire_global_lock(&pMac->sme);
 	if (QDF_IS_STATUS_SUCCESS(status)) {
-		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
-			  "SSR level is changed %d", enableSSR);
+		sme_debug("SSR level is changed %d", enableSSR);
 		/* not serializing this messsage, as this is only going
 		 * to set a variable in WMA/WDI
 		 */
@@ -16074,7 +16049,7 @@ QDF_STATUS sme_get_beacon_frm(tHalHandle hal, tCsrRoamProfile *profile,
 	bss_list = (tScanResultList *)result_handle;
 	bss_descp = csr_get_fst_bssdescr_ptr(bss_list);
 	if (!bss_descp) {
-		sms_log(mac_ctx, LOGE, FL("unable to fetch bss descriptor"));
+		sme_err("unable to fetch bss descriptor");
 		status = QDF_STATUS_E_FAULT;
 		goto free_scan_flter;
 	}
@@ -16126,7 +16101,7 @@ QDF_STATUS sme_delete_all_tdls_peers(tHalHandle hal, uint8_t session_id)
 
 	msg = qdf_mem_malloc(sizeof(*msg));
 	if (NULL == msg) {
-		sms_log(p_mac, LOGE, FL("memory alloc failed"));
+		sme_err("memory alloc failed");
 		return QDF_STATUS_E_FAILURE;
 	}
 
@@ -16141,8 +16116,7 @@ QDF_STATUS sme_delete_all_tdls_peers(tHalHandle hal, uint8_t session_id)
 	status = umac_send_mb_message_to_mac(msg);
 
 	if (status != QDF_STATUS_SUCCESS) {
-		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
-			  FL("cds_send_mb_message_to_mac Failed"));
+		sme_err("cds_send_mb_message_to_mac Failed");
 		status = QDF_STATUS_E_FAILURE;
 	}
 
@@ -16156,8 +16130,7 @@ QDF_STATUS sme_set_peer_param(uint8_t *peer_addr, uint32_t param_id,
 
 	wma_handle = cds_get_context(QDF_MODULE_ID_WMA);
 	if (!wma_handle) {
-		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
-				"wma handle is NULL");
+		sme_err("wma handle is NULL");
 		return QDF_STATUS_E_FAILURE;
 	}
 
@@ -16189,7 +16162,7 @@ QDF_STATUS sme_rso_cmd_status_cb(tHalHandle hal,
 	tpAniSirGlobal mac = PMAC_STRUCT(hal);
 
 	mac->sme.rso_cmd_status_cb = cb;
-	sms_log(mac, LOG1, FL("Registered RSO command status callback"));
+	sme_debug("Registered RSO command status callback");
 	return status;
 }
 
@@ -16224,10 +16197,9 @@ QDF_STATUS sme_congestion_register_callback(tHalHandle hal,
 	if (QDF_IS_STATUS_SUCCESS(status)) {
 		mac->sme.congestion_cb = congestion_cb;
 		sme_release_global_lock(&mac->sme);
-		sms_log(mac, LOG1, FL("congestion callback set"));
+		sme_debug("congestion callback set");
 	} else {
-		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
-			FL("Aquiring lock failed %d"), status);
+		sme_err("Aquiring lock failed %d", status);
 	}
 
 	return status;

core/sme/src/common/sme_ft_api.c

@@ -24,8 +24,8 @@
  * under proprietary terms before Copyright ownership was assigned
  * to the Linux Foundation.
  */
-
-#include <sms_debug.h>
+#include <sir_common.h>
+#include <ani_global.h>
 #include <csr_inside_api.h>
 #include <csr_neighbor_roam.h>
 #include <sir_api.h>

core/sme/src/common/sme_power_save.c

@@ -27,7 +27,9 @@
 
 #include "sme_power_save.h"
 #include "sme_power_save_api.h"
-#include "sms_debug.h"
+#include <sir_common.h>
+#include <ani_global.h>
+#include <utils_api.h>
 #include "sme_trace.h"
 #include "qdf_mem.h"
 #include "qdf_types.h"

core/sme/src/common/sme_trace.c

@@ -34,7 +34,6 @@
 
    ========================================================================*/
 #include "ani_global.h"          /* for tpAniSirGlobal */
-#include "sms_debug.h"
 #include "mac_trace.h"
 #include "sme_trace.h"
 #include "sme_internal.h"

core/sme/src/csr/csr_api_roam.c

@@ -36,7 +36,6 @@
 #include "wma_types.h"
 #include "wma_if.h"          /* for STA_INVALID_IDX. */
 #include "csr_inside_api.h"
-#include "sms_debug.h"
 #include "sme_trace.h"
 #include "sme_qos_internal.h"
 #include "sme_inside.h"
@@ -6030,8 +6029,7 @@ void csr_roam_complete(tpAniSirGlobal mac_ctx, eCsrRoamCompleteResult Result,
 	}
 	sme_cmd = cmd->umac_cmd;
 	if (!sme_cmd) {
-		sms_log(mac_ctx, LOGE,
-			FL("sme_cmd is NULL"));
+		sme_err("sme_cmd is NULL");
 		return;
 	}
 	if (eSmeCommandRoam == sme_cmd->command) {
@@ -6045,7 +6043,7 @@ void csr_reset_pmkid_candidate_list(tpAniSirGlobal pMac, uint32_t sessionId)
 {
 	tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId);
 	if (!pSession) {
-		sme_err("  session %d not found ", sessionId);
+		sme_err("session %d not found ", sessionId);
 		return;
 	}
 	qdf_mem_set(&(pSession->PmkidCandidateInfo[0]),
@@ -6058,7 +6056,7 @@ void csr_reset_bkid_candidate_list(tpAniSirGlobal pMac, uint32_t sessionId)
 {
 	tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId);
 	if (!pSession) {
-		sme_err("  session %d not found ", sessionId);
+		sme_err("session %d not found ", sessionId);
 		return;
 	}
 	qdf_mem_set(&(pSession->BkidCandidateInfo[0]),
@@ -12378,7 +12376,7 @@ csr_roam_get_phy_mode_band_for_bss(tpAniSirGlobal mac_ctx,
 		else
 			cfg_dot11_mode = eCSR_CFG_DOT11_MODE_11A;
 	}
-	sms_log(mac_ctx, LOG1, FL("dot11mode: %d"), cfg_dot11_mode);
+	sme_debug("dot11mode: %d", cfg_dot11_mode);
 	return cfg_dot11_mode;
 }
 
@@ -18451,7 +18449,7 @@ tSmeCmd *csr_get_command_buffer(tpAniSirGlobal pMac)
 static void csr_free_cmd_memory(tpAniSirGlobal pMac, tSmeCmd *pCommand)
 {
 	if (!pCommand) {
-		sms_log(pMac, LOGE, "pCommand is NULL");
+		sme_err("pCommand is NULL");
 		return;
 	}
 	switch (pCommand->command) {
@@ -18799,7 +18797,7 @@ QDF_STATUS csr_set_serialization_params_to_cmd(tpAniSirGlobal mac_ctx,
 	sme_debug("filled cmd_type[%d] cmd_id[%d]",
 		cmd->cmd_type, cmd->cmd_id);
 	if (cmd->cmd_type == WLAN_SER_CMD_MAX) {
-		sms_log(mac_ctx, LOGE, FL("serialization enum not found"));
+		sme_err("serialization enum not found");
 		return status;
 	}
 	cmd->vdev = wlan_objmgr_get_vdev_by_id_from_psoc(mac_ctx->psoc,
@@ -18845,14 +18843,14 @@ QDF_STATUS csr_queue_sme_command(tpAniSirGlobal mac_ctx, tSmeCmd *sme_cmd,
 	if (QDF_STATUS_SUCCESS == status) {
 		if (WLAN_SER_CMD_DENIED_UNSPECIFIED ==
 				wlan_serialization_request(&cmd)) {
-			sms_log(mac_ctx, LOGE, FL("failed to enq to req"));
+			sme_err("failed to enq to req");
 			status = QDF_STATUS_E_FAILURE;
 		}
 		if (cmd.vdev)
 			wlan_objmgr_vdev_release_ref(cmd.vdev,
 						WLAN_LEGACY_SME_ID);
 	} else {
-		sms_log(mac_ctx, LOGE, FL("failed to set ser params"));
+		sme_err("failed to set ser params");
 		status = QDF_STATUS_E_FAILURE;
 	}
 	return status;
@@ -19772,7 +19770,7 @@ void csr_process_set_hw_mode(tpAniSirGlobal mac, tSmeCmd *command)
 			mac->psoc, command->u.set_hw_mode_cmd.hw_mode_index);
 
 	if (POLICY_MGR_HW_MODE_NOT_IN_PROGRESS == hw_mode) {
-		sms_log(mac, LOGE, FL("hw_mode %d, failing"), hw_mode);
+		sme_err("hw_mode %d, failing", hw_mode);
 		goto fail;
 	}
 

core/sme/src/csr/csr_api_scan.c

@@ -37,7 +37,6 @@
 
 #include "csr_inside_api.h"
 #include "sme_inside.h"
-#include "sms_debug.h"
 
 #include "csr_support.h"
 
@@ -1518,8 +1517,7 @@ static void csr_scan_add_result(tpAniSirGlobal mac_ctx, tCsrScanResult *pResult,
 	buf = qdf_nbuf_alloc(NULL, qdf_roundup(buf_len, 4),
 				0, 4, false);
 	if (!buf) {
-		sms_log(mac_ctx, LOGE,
-			FL("Failed to allocate wbuf for mgmt rx len (%u)"),
+		sme_err("Failed to allocate wbuf for mgmt rx len (%u)",
 			buf_len);
 		return;
 	}

core/sme/src/csr/csr_cmd_process.c

@@ -36,7 +36,6 @@
 
 #include "csr_inside_api.h"
 #include "sme_inside.h"
-#include "sms_debug.h"
 #include "mac_trace.h"
 
 /**

core/sme/src/csr/csr_host_scan_roam.c

@@ -26,7 +26,6 @@
 
 #include "wma_types.h"
 #include "csr_inside_api.h"
-#include "sms_debug.h"
 #include "sme_qos_internal.h"
 #include "sme_inside.h"
 #include "host_diag_core_event.h"

core/sme/src/csr/csr_neighbor_roam.c

@@ -36,7 +36,6 @@
 
 #include "wma_types.h"
 #include "csr_inside_api.h"
-#include "sms_debug.h"
 #include "sme_qos_internal.h"
 #include "sme_inside.h"
 #include "host_diag_core_event.h"

core/sme/src/csr/csr_roam_preauth.c

@@ -26,7 +26,6 @@
 
 #include "wma_types.h"
 #include "csr_inside_api.h"
-#include "sms_debug.h"
 #include "sme_qos_internal.h"
 #include "sme_inside.h"
 #include "host_diag_core_event.h"

core/sme/src/csr/csr_tdls_process.c

@@ -38,7 +38,6 @@
 #include "ani_global.h"          /* for tpAniSirGlobal */
 #include "csr_inside_api.h"
 #include "sme_inside.h"
-#include "sms_debug.h"
 
 #include "csr_support.h"
 

core/sme/src/csr/csr_util.c

@@ -36,7 +36,6 @@
 
 #include "csr_support.h"
 #include "csr_inside_api.h"
-#include "sms_debug.h"
 #include "sme_qos_internal.h"
 #include "wma_types.h"
 #include "cds_utils.h"

core/sme/src/nan/nan_api.c

@@ -24,9 +24,9 @@
  * under proprietary terms before Copyright ownership was assigned
  * to the Linux Foundation.
  */
-
+#include <sir_common.h>
+#include <ani_global.h>
 #include "sme_api.h"
-#include "sms_debug.h"
 #include "csr_inside_api.h"
 #include "sme_inside.h"
 #include "nan_api.h"

core/sme/src/nan/nan_datapath_api.c

@@ -23,7 +23,8 @@
  *
  * SME NAN Data path API implementation
  */
-#include "sms_debug.h"
+#include <sir_common.h>
+#include <ani_global.h>
 #include "sme_api.h"
 #include "sme_inside.h"
 #include "csr_internal.h"

core/sme/src/p2p/p2p_api.c

@@ -26,7 +26,8 @@
  */
 
 #include "sme_api.h"
-#include "sms_debug.h"
+#include <sir_common.h>
+#include <ani_global.h>
 #include "csr_inside_api.h"
 #include "sme_inside.h"
 #include "p2p_api.h"
@@ -271,8 +272,6 @@ QDF_STATUS p2p_remain_on_channel(tHalHandle hHal, uint8_t sessionId,
 		status = csr_queue_sme_command(pMac, pRemainChlCmd, false);
 	} while (0);
 
-	sms_log(pMac, LOGW, "exiting function %s", __func__);
-
 	return status;
 }
 

core/sme/src/qos/sme_qos.c

@@ -44,7 +44,6 @@
 #include "host_diag_core_event.h"
 #include "host_diag_core_log.h"
 
-#include "sms_debug.h"
 #include "utils_parser.h"
 #include "sme_power_save_api.h"
 

core/sme/src/rrm/sme_rrm.c

@@ -41,7 +41,6 @@
 #include "ani_global.h"
 #include "sme_inside.h"
 #include "sme_api.h"
-#include "sms_debug.h"
 #include "cfg_api.h"
 
 #ifdef FEATURE_WLAN_DIAG_SUPPORT

core/wma/src/wma_nan_datapath.h

@@ -27,6 +27,8 @@
 #ifndef __WMA_NAN_DATAPATH_H
 #define __WMA_NAN_DATAPATH_H
 
+#include <sir_common.h>
+#include <ani_global.h>
 #include "wma.h"
 #include "sir_api.h"
 #include "sme_nan_datapath.h"