From 8bfdee01548fd0b3c6d4c9605365af2bb68c840a Mon Sep 17 00:00:00 2001
From: Anurag Chouhan <achouhan@codeaurora.org>
Date: Mon, 4 Apr 2016 17:11:39 +0530
Subject: [PATCH] qcacmn: Add WIN Driver compilation fix

Fix compilation errors for WIN driver

Change-Id: I2b7344c9632ea673754aa1f4d7003473b2527ada
CRs-Fixed: 981187
---
 qdf/inc/qdf_types.h          | 11 ++++-------
 qdf/linux/src/i_qdf_trace.h  |  2 +-
 qdf/linux/src/qdf_mc_timer.c |  9 ++++-----
 qdf/linux/src/qdf_mem.c      |  1 +
 4 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/qdf/inc/qdf_types.h b/qdf/inc/qdf_types.h
index 499bea90650c..b0e312677ca0 100644
--- a/qdf/inc/qdf_types.h
+++ b/qdf/inc/qdf_types.h
@@ -215,7 +215,6 @@ typedef void (*qdf_timer_func_t)(void *);
 
 #define qdf_offsetof(type, field) offsetof(type, field)
 
-#ifdef CONFIG_MCL
 /**
  * typedef QDF_MODULE_ID - QDF Module IDs
  * @QDF_MODULE_ID_TLSHIM: TLSHIM module ID
@@ -273,6 +272,7 @@ typedef enum {
 	QDF_MODULE_ID_MAX
 } QDF_MODULE_ID;
 
+#ifdef CONFIG_MCL
 /**
  * enum tQDF_ADAPTER_MODE - Concurrency role.
  * @QDF_STA_MODE: STA mode
@@ -324,16 +324,13 @@ enum tQDF_GLOBAL_CON_MODE {
 
 #define qdf_print(args...) \
 	QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, ## args)
-#define qdf_vprint    __qdf_vprint
-#define qdf_snprint   __qdf_snprint
+
 #else
-
 #define qdf_print printk
-
 #endif /* CONFIG_MCL */
 
-
-
+#define qdf_vprint    __qdf_vprint
+#define qdf_snprint   __qdf_snprint
 
 #ifdef WLAN_OPEN_P2P_INTERFACE
 /* This should match with WLAN_MAX_INTERFACES */
diff --git a/qdf/linux/src/i_qdf_trace.h b/qdf/linux/src/i_qdf_trace.h
index 2f3e1c910168..dd3709b30f41 100644
--- a/qdf/linux/src/i_qdf_trace.h
+++ b/qdf/linux/src/i_qdf_trace.h
@@ -70,7 +70,7 @@
 				printk("\n"); \
 			} \
 		} while (0)
-#define QDF_TRACE printk
+#define QDF_TRACE(x, y, args...) printk(args)
 
 #endif /* CONFIG_MCL */
 
diff --git a/qdf/linux/src/qdf_mc_timer.c b/qdf/linux/src/qdf_mc_timer.c
index 642d9be0bb45..d8dec18cf6f3 100644
--- a/qdf/linux/src/qdf_mc_timer.c
+++ b/qdf/linux/src/qdf_mc_timer.c
@@ -310,7 +310,7 @@ QDF_STATUS qdf_mc_timer_init(qdf_mc_timer_t *timer, QDF_TIMER_TYPE timer_type,
 	/* set the various members of the timer structure
 	 * with arguments passed or with default values
 	 */
-	spin_lock_init(&timer->platform_info.spinlock);
+	qdf_spinlock_create(&timer->platform_info.spinlock);
 	if (QDF_TIMER_TYPE_SW == timer_type)
 		init_timer_deferrable(&(timer->platform_info.timer));
 	else
@@ -454,7 +454,6 @@ EXPORT_SYMBOL(qdf_mc_timer_destroy);
 QDF_STATUS qdf_mc_timer_destroy(qdf_mc_timer_t *timer)
 {
 	QDF_STATUS v_status = QDF_STATUS_SUCCESS;
-	unsigned long flags;
 
 	/* check for invalid pointer */
 	if (NULL == timer) {
@@ -471,7 +470,7 @@ QDF_STATUS qdf_mc_timer_destroy(qdf_mc_timer_t *timer)
 		QDF_ASSERT(0);
 		return QDF_STATUS_E_INVAL;
 	}
-	spin_lock_irqsave(&timer->platform_info.spinlock, flags);
+	qdf_spin_lock_irqsave(&timer->platform_info.spinlock);
 
 	switch (timer->state) {
 
@@ -501,11 +500,11 @@ QDF_STATUS qdf_mc_timer_destroy(qdf_mc_timer_t *timer)
 	if (QDF_STATUS_SUCCESS == v_status) {
 		timer->platform_info.cookie = LINUX_INVALID_TIMER_COOKIE;
 		timer->state = QDF_TIMER_STATE_UNUSED;
-		spin_unlock_irqrestore(&timer->platform_info.spinlock, flags);
+		qdf_spin_unlock_irqrestore(&timer->platform_info.spinlock);
 		return v_status;
 	}
 
-	spin_unlock_irqrestore(&timer->platform_info.spinlock, flags);
+	qdf_spin_unlock_irqrestore(&timer->platform_info.spinlock);
 
 	QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s: Cannot destroy timer in state = %d", __func__,
diff --git a/qdf/linux/src/qdf_mem.c b/qdf/linux/src/qdf_mem.c
index 53c948d94c37..0270b5724eee 100644
--- a/qdf/linux/src/qdf_mem.c
+++ b/qdf/linux/src/qdf_mem.c
@@ -35,6 +35,7 @@
 #include "qdf_lock.h"
 #include "qdf_mc_timer.h"
 #include "qdf_module.h"
+#include <qdf_trace.h>
 
 #if defined(CONFIG_CNSS)
 #include <net/cnss.h>