qcacld-3.0: UMAC: Remove obsolete file cfg_debug.[c|h]

Remove obsolete file cfg_debug.[c|h].

Change-Id: I54c478971af0f7edb2609ded7f8bcc189de1a9cb
CRs-Fixed: 2020798

6 files changed, 17 insertions, 57 deletions

diff --git a/Kbuild b/Kbuild
index 7b28544688c1..24f3b03fa464 100644
--- a/Kbuild
+++ b/Kbuild
@@ -527,7 +527,6 @@ MAC_INC := 	-I$(WLAN_ROOT)/$(MAC_INC_DIR) \
 		-I$(WLAN_ROOT)/$(MAC_SRC_DIR)/pe/nan
 
 MAC_CFG_OBJS := $(MAC_SRC_DIR)/cfg/cfg_api.o \
-		$(MAC_SRC_DIR)/cfg/cfg_debug.o \
 		$(MAC_SRC_DIR)/cfg/cfg_param_name.o \
 		$(MAC_SRC_DIR)/cfg/cfg_proc_msg.o \
 		$(MAC_SRC_DIR)/cfg/cfg_send_msg.o
diff --git a/core/mac/src/cfg/cfg_api.c b/core/mac/src/cfg/cfg_api.c
index e249b864404e..5d00f7c9c8f8 100644
--- a/core/mac/src/cfg/cfg_api.c
+++ b/core/mac/src/cfg/cfg_api.c
@@ -38,7 +38,6 @@
 
 #include "cds_api.h"
 #include "cfg_priv.h"
-#include "cfg_debug.h"
 #include "wma_types.h"
 #include "cfg_api.h"
 
@@ -978,4 +977,16 @@ uint8_t *cfg_get_vendor_ie_ptr_from_oui(tpAniSirGlobal mac_ctx,
 	}
 	return NULL;
 }
+
+void cfg_log(tpAniSirGlobal pMac, uint32_t loglevel, const char *pString, ...)
+{
+#ifdef WLAN_DEBUG
+	va_list marker;
+
+	va_start(marker, pString);
+	log_debug(pMac, SIR_CFG_MODULE_ID, loglevel, pString, marker);
+	va_end(marker);
+#endif
+}
+
 /* --------------------------------------------------------------------- */
diff --git a/core/mac/src/cfg/cfg_debug.h b/core/mac/src/cfg/cfg_debug.h
deleted file mode 100644
index 424152e6e9e0..000000000000
--- a/core/mac/src/cfg/cfg_debug.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2011-2012, 2014-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.
- */
-
-/*
- *
- * Author:      Kevin Nguyen
- * Date:        04/09/02
- * History:-
- * 04/09/02        Created.
- * --------------------------------------------------------------------
- */
-
-#ifndef __CFG_DEBUG_H__
-#define __CFG_DEBUG_H__
-
-#include "sir_debug.h"
-#include "utils_api.h"
-#include "lim_trace.h"
-
-#if !defined(__printf)
-#define __printf(a, b)
-#endif
-
-void __printf(3, 4) cfg_log(tpAniSirGlobal pMac, uint32_t loglevel,
-			    const char *pString, ...);
-
-#endif
diff --git a/core/mac/src/cfg/cfg_proc_msg.c b/core/mac/src/cfg/cfg_proc_msg.c
index 91c5ccffade2..5726082d755a 100644
--- a/core/mac/src/cfg/cfg_proc_msg.c
+++ b/core/mac/src/cfg/cfg_proc_msg.c
@@ -31,8 +31,8 @@
 #include "cds_api.h"
 #include "ani_global.h"
 #include "cfg_priv.h"
-#include "cfg_debug.h"
 #include "wma_types.h"
+#include "lim_trace.h"
 
 cgstatic cfg_static[CFG_PARAM_MAX_NUM] = {
 	{WNI_CFG_STA_ID,
diff --git a/core/mac/src/cfg/cfg_send_msg.c b/core/mac/src/cfg/cfg_send_msg.c
index a50652c063db..3283f1eacedd 100644
--- a/core/mac/src/cfg/cfg_send_msg.c
+++ b/core/mac/src/cfg/cfg_send_msg.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014-2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012, 2014-2017 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -38,7 +38,6 @@
 #include "cds_api.h"
 #include "cfg_priv.h"
 #include "lim_trace.h"
-#include "cfg_debug.h"
 
 /*--------------------------------------------------------------------*/
 /* ATTENTION:  The functions contained in this module are to be used  */
diff --git a/core/mac/src/include/cfg_api.h b/core/mac/src/include/cfg_api.h
index 2240dd482293..368b10bae958 100644
--- a/core/mac/src/include/cfg_api.h
+++ b/core/mac/src/include/cfg_api.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2012, 2015-2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2012, 2015-2017 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -127,5 +127,7 @@ uint8_t *cfg_get_vendor_ie_ptr_from_oui(tpAniSirGlobal mac_ctx,
 					uint8_t oui_size,
 					uint8_t *ie,
 					uint16_t ie_len);
+void cfg_log(tpAniSirGlobal pMac, uint32_t loglevel,
+		const char *pString, ...);
 
 #endif /* __CFGAPI_H */