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

19 files changed, 16 insertions, 81 deletions

diff --git a/core/sme/inc/sms_debug.h b/core/sme/inc/sms_debug.h
deleted file mode 100644
index adebc13604be..000000000000
--- a/core/sme/inc/sms_debug.h
+++ /dev/null
@@ -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__ */
diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c
index b544a7afcf85..b60e931a091f 100644
--- a/core/sme/src/common/sme_api.c
+++ b/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"
@@ -62,8 +63,6 @@
 #include "sme_nan_datapath.h"
 #include "csr_api.h"
 
-#define LOG_SIZE 256
-
 static tSelfRecoveryStats g_self_recovery_stats;
 
 static QDF_STATUS init_sme_cmd_list(tpAniSirGlobal pMac);
@@ -5827,17 +5826,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
diff --git a/core/sme/src/common/sme_ft_api.c b/core/sme/src/common/sme_ft_api.c
index cc236369b138..1464d4995829 100644
--- a/core/sme/src/common/sme_ft_api.c
+++ b/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>
 
diff --git a/core/sme/src/common/sme_power_save.c b/core/sme/src/common/sme_power_save.c
index f205f0cdefc9..6822a7194ce5 100644
--- a/core/sme/src/common/sme_power_save.c
+++ b/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"
diff --git a/core/sme/src/common/sme_trace.c b/core/sme/src/common/sme_trace.c
index 7b266968cb41..0f5f4dfaa77c 100644
--- a/core/sme/src/common/sme_trace.c
+++ b/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"
diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c
index 4cb9f0c39ef7..cb2e7936359c 100644
--- a/core/sme/src/csr/csr_api_roam.c
+++ b/core/sme/src/csr/csr_api_roam.c
@@ -37,7 +37,6 @@
 #include "wma_if.h"          /* for STA_INVALID_IDX. */
 #include "cds_mq.h"
 #include "csr_inside_api.h"
-#include "sms_debug.h"
 #include "sme_trace.h"
 #include "sme_qos_internal.h"
 #include "sme_inside.h"
diff --git a/core/sme/src/csr/csr_api_scan.c b/core/sme/src/csr/csr_api_scan.c
index 5fe5d6e0c97d..823f3b933cb9 100644
--- a/core/sme/src/csr/csr_api_scan.c
+++ b/core/sme/src/csr/csr_api_scan.c
@@ -38,7 +38,6 @@
 #include "cds_mq.h"
 #include "csr_inside_api.h"
 #include "sme_inside.h"
-#include "sms_debug.h"
 
 #include "csr_support.h"
 
diff --git a/core/sme/src/csr/csr_cmd_process.c b/core/sme/src/csr/csr_cmd_process.c
index cc55fb8c35d8..351695c21e1b 100644
--- a/core/sme/src/csr/csr_cmd_process.c
+++ b/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"
 
 /**
diff --git a/core/sme/src/csr/csr_host_scan_roam.c b/core/sme/src/csr/csr_host_scan_roam.c
index 6b3ed9f22d1d..c43cb48556ca 100644
--- a/core/sme/src/csr/csr_host_scan_roam.c
+++ b/core/sme/src/csr/csr_host_scan_roam.c
@@ -27,7 +27,6 @@
 #include "wma_types.h"
 #include "cds_mq.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"
diff --git a/core/sme/src/csr/csr_neighbor_roam.c b/core/sme/src/csr/csr_neighbor_roam.c
index bc4dc0c18b92..442b548c8bbf 100644
--- a/core/sme/src/csr/csr_neighbor_roam.c
+++ b/core/sme/src/csr/csr_neighbor_roam.c
@@ -37,7 +37,6 @@
 #include "wma_types.h"
 #include "cds_mq.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"
diff --git a/core/sme/src/csr/csr_roam_preauth.c b/core/sme/src/csr/csr_roam_preauth.c
index 4350bc8943a0..75b212c260cd 100644
--- a/core/sme/src/csr/csr_roam_preauth.c
+++ b/core/sme/src/csr/csr_roam_preauth.c
@@ -27,7 +27,6 @@
 #include "wma_types.h"
 #include "cds_mq.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"
diff --git a/core/sme/src/csr/csr_tdls_process.c b/core/sme/src/csr/csr_tdls_process.c
index 9e1195c7447a..5b9906158fa1 100644
--- a/core/sme/src/csr/csr_tdls_process.c
+++ b/core/sme/src/csr/csr_tdls_process.c
@@ -39,7 +39,6 @@
 #include "cds_mq.h"
 #include "csr_inside_api.h"
 #include "sme_inside.h"
-#include "sms_debug.h"
 
 #include "csr_support.h"
 
diff --git a/core/sme/src/csr/csr_util.c b/core/sme/src/csr/csr_util.c
index 07bcac2a42c5..3c5b27746269 100644
--- a/core/sme/src/csr/csr_util.c
+++ b/core/sme/src/csr/csr_util.c
@@ -37,7 +37,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"
diff --git a/core/sme/src/nan/nan_api.c b/core/sme/src/nan/nan_api.c
index c4570b07137b..1eadc8fd9cb4 100644
--- a/core/sme/src/nan/nan_api.c
+++ b/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"
diff --git a/core/sme/src/nan/nan_datapath_api.c b/core/sme/src/nan/nan_datapath_api.c
index 3c5b44ead883..9036ba4dd2d8 100644
--- a/core/sme/src/nan/nan_datapath_api.c
+++ b/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"
diff --git a/core/sme/src/p2p/p2p_api.c b/core/sme/src/p2p/p2p_api.c
index a0b77f95572a..a194b5a8d55d 100644
--- a/core/sme/src/p2p/p2p_api.c
+++ b/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"
diff --git a/core/sme/src/qos/sme_qos.c b/core/sme/src/qos/sme_qos.c
index 4aab1cbb0d5e..da9ee68ca809 100644
--- a/core/sme/src/qos/sme_qos.c
+++ b/core/sme/src/qos/sme_qos.c
@@ -43,7 +43,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"
 
diff --git a/core/sme/src/rrm/sme_rrm.c b/core/sme/src/rrm/sme_rrm.c
index 0723eeb3c2e8..1b4947139ec2 100644
--- a/core/sme/src/rrm/sme_rrm.c
+++ b/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
diff --git a/core/wma/src/wma_nan_datapath.h b/core/wma/src/wma_nan_datapath.h
index 6f9013853bbf..962244dbe2c5 100644
--- a/core/wma/src/wma_nan_datapath.h
+++ b/core/wma/src/wma_nan_datapath.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2017 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -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"