qcacld-2.0: Fix build errors after disable TRACE_RECORD and ANI_LOGDUMP

Fix some compilation errors after disable feature TRACE_RECORD and
ANI_LOGDUMP

Change-Id: I133123f31ae6dab8fe7ecc36d9d241bc20a2bedd
CRs-Fixed: 1059208

6 files changed, 63 insertions, 15 deletions

diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index 0165e5fbac5e..d1d090d83bc2 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -21430,7 +21430,9 @@ static int __wlan_hdd_cfg80211_add_station(struct wiphy *wiphy,
 {
     int status = -EPERM;
 #ifdef FEATURE_WLAN_TDLS
+#ifdef TRACE_RECORD
     hdd_adapter_t *pAdapter =  WLAN_HDD_GET_PRIV_PTR(dev);
+#endif
     hdd_context_t *pHddCtx = wiphy_priv(wiphy);
     u32 mask, set;
 
diff --git a/CORE/HDD/src/wlan_hdd_p2p.c b/CORE/HDD/src/wlan_hdd_p2p.c
index 52e2f03c967a..5a9673d9d9fc 100644
--- a/CORE/HDD/src/wlan_hdd_p2p.c
+++ b/CORE/HDD/src/wlan_hdd_p2p.c
@@ -2409,14 +2409,13 @@ int __wlan_hdd_del_virtual_intf(struct wiphy *wiphy, struct net_device *dev)
     struct net_device *dev = wdev->netdev;
 #endif
     hdd_context_t *pHddCtx = (hdd_context_t*) wiphy_priv(wiphy);
-    hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR( dev );
     hdd_adapter_t *pVirtAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
     int status;
     ENTER();
 
     MTRACE(vos_trace(VOS_MODULE_ID_HDD,
                      TRACE_CODE_HDD_DEL_VIRTUAL_INTF,
-                     pAdapter->sessionId, pAdapter->device_mode));
+                     pVirtAdapter->sessionId, pVirtAdapter->device_mode));
     hddLog(LOG1, FL("Device_mode %s(%d)"),
            hdd_device_mode_to_string(pVirtAdapter->device_mode),
            pVirtAdapter->device_mode);
diff --git a/CORE/MAC/inc/logDump.h b/CORE/MAC/inc/logDump.h
index 734df7aa8bf0..863b746c0010 100644
--- a/CORE/MAC/inc/logDump.h
+++ b/CORE/MAC/inc/logDump.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013,2016 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -64,6 +64,18 @@ typedef struct sRegList {
 
 int log_sprintf(tpAniSirGlobal pMac, char *pBuf, char *fmt, ... );
 
+#ifdef ANI_LOGDUMP
+void logPrintf(tpAniSirGlobal mac, tANI_U32 cmd,
+			   tANI_U32 arg1, tANI_U32 arg2,
+			   tANI_U32 arg3, tANI_U32 arg4);
+#else
+static inline void logPrintf(tpAniSirGlobal mac, tANI_U32 cmd,
+			tANI_U32 arg1, tANI_U32 arg2,
+			tANI_U32 arg3, tANI_U32 arg4)
+{
+    return;
+}
+#endif
 char *
 dump_log_level_set( tpAniSirGlobal pMac, tANI_U32 arg1, tANI_U32 arg2, tANI_U32 arg3, tANI_U32 arg4, char *p);
 
diff --git a/CORE/MAC/inc/macTrace.h b/CORE/MAC/inc/macTrace.h
index 0377885b94b2..41b39c805a1f 100644
--- a/CORE/MAC/inc/macTrace.h
+++ b/CORE/MAC/inc/macTrace.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013,2016 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -44,17 +44,13 @@
 
 #include "aniGlobal.h"
 
-
-#ifdef TRACE_RECORD
-
 #define MAC_TRACE_GET_MODULE_ID(data) ((data >> 8) & 0xff)
 #define MAC_TRACE_GET_MSG_ID(data)       (data & 0xffff)
 
-
 #define eLOG_NODROP_MISSED_BEACON_SCENARIO 0
 #define eLOG_PROC_DEAUTH_FRAME_SCENARIO 1
 
-
+#ifdef TRACE_RECORD
 void macTraceReset(tpAniSirGlobal pMac);
 void macTrace(tpAniSirGlobal pMac, tANI_U8 code, tANI_U16 session,
               tANI_U32 data);
@@ -66,8 +62,6 @@ tANI_U8* macTraceGetWdaMsgString( tANI_U16 wdaMsg );
 tANI_U8* macTraceGetSmeMsgString( tANI_U16 smeMsg );
 tANI_U8* macTraceGetModuleString( tANI_U8 moduleId);
 tANI_U8* macTraceGetInfoLogString( tANI_U16 infoLog );
-eHalStatus pe_AcquireGlobalLock( tAniSirLim *psPe);
-eHalStatus pe_ReleaseGlobalLock( tAniSirLim *psPe);
 
 tANI_U8* macTraceGetHDDWlanConnState(tANI_U16 connState);
 
@@ -81,7 +75,47 @@ tANI_U8* macTraceGetcsrRoamSubState(tANI_U16 csrRoamSubState);
 tANI_U8* macTraceGetLimSmeState(tANI_U16 limState);
 tANI_U8* macTraceGetLimMlmState(tANI_U16 mlmState);
 tANI_U8* macTraceGetTLState(tANI_U16 tlState);
-
+#else
+static inline tANI_U8*
+macTraceGetWdaMsgString( tANI_U16 wdamsg )
+{
+	return NULL;
+}
+static inline tANI_U8*
+macTraceGetHDDWlanConnState(tANI_U16 connstate)
+{
+	return NULL;
+}
+static inline tANI_U8*
+macTraceGetNeighbourRoamState(tANI_U16 neighbourroamstate)
+{
+	return NULL;
+}
+static inline tANI_U8*
+macTraceGetcsrRoamState(tANI_U16 csrroamstate)
+{
+	return NULL;
+}
+static inline tANI_U8*
+macTraceGetcsrRoamSubState(tANI_U16 csrroamsubstate)
+{
+	return NULL;
+}
+static inline tANI_U8*
+macTraceGetLimSmeState(tANI_U16 limstate)
+{
+	return NULL;
+}
+static inline tANI_U8*
+macTraceGetLimMlmState(tANI_U16 mlmstate)
+{
+	return NULL;
+}
+static inline tANI_U8*
+macTraceGetTLState(tANI_U16 tlstate)
+{
+	return NULL;
+}
 #endif
 
 #endif
diff --git a/CORE/MAC/src/pe/include/limApi.h b/CORE/MAC/src/pe/include/limApi.h
index 05c1921a4786..3cada4883cc8 100644
--- a/CORE/MAC/src/pe/include/limApi.h
+++ b/CORE/MAC/src/pe/include/limApi.h
@@ -293,5 +293,7 @@ typedef void (*tp_pe_packetdump_cb)(adf_nbuf_t netbuf,
 void pe_register_packetdump_callback(tp_pe_packetdump_cb pe_packetdump_cb);
 void pe_deregister_packetdump_callback(void);
 
+eHalStatus pe_AcquireGlobalLock(tAniSirLim *pe);
+eHalStatus pe_ReleaseGlobalLock(tAniSirLim *pe);
 /************************************************************/
 #endif /* __LIM_API_H */
diff --git a/CORE/SYS/legacy/src/system/src/macInitApi.c b/CORE/SYS/legacy/src/system/src/macInitApi.c
index 17205641c5fa..c8c42b55d098 100644
--- a/CORE/SYS/legacy/src/system/src/macInitApi.c
+++ b/CORE/SYS/legacy/src/system/src/macInitApi.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2014 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2014,2016 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -62,9 +62,8 @@ tSirRetStatus macReset(tpAniSirGlobal pMac, tANI_U32 rc);
 
 tSirRetStatus macPreStart(tHalHandle hHal)
 {
-   tpAniSirGlobal pMac = (tpAniSirGlobal) hHal;
-
 #if defined(ANI_LOGDUMP)
+   tpAniSirGlobal pMac = (tpAniSirGlobal) hHal;
    //logDumpInit must be called before any module starts
    logDumpInit(pMac);
 #endif //#if defined(ANI_LOGDUMP)