wlan: wmi: Remove obsolete ISOC and WIFI_2_0 conditions

The qcacld driver contains a large amount of conditional compilation
that was initially added to allow the driver to support both
integrated and discrete wlan solutions.  However it has been decided
that the integrated solutions will only be supported by the prima
driver, so remove from WMI all of the conditional compilation that is
now obsolete.
- Code that is conditional upon QCA_WIFI_ISOC being defined is
  removed.
- Code that is conditional upon QCA_WIFI_ISOC not being defined is
  retained without conditional compilation.

Change-Id: I9a62b7127b08a12877f70d593261c107f26cd86d
CRs-fixed: 709179

2 files changed, 2 insertions, 15 deletions

diff --git a/CORE/SERVICES/WMI/wmi_unified.c b/CORE/SERVICES/WMI/wmi_unified.c
index 181dc616d5ed..42aee5b6d316 100644
--- a/CORE/SERVICES/WMI/wmi_unified.c
+++ b/CORE/SERVICES/WMI/wmi_unified.c
@@ -791,8 +791,7 @@ void wmi_control_rx(void *ctx, HTC_PACKET *htc_packet)
 	int tlv_ok_status = 0;
 #endif /* QCA_CONFIG_SMP */
 
-#if (!defined(QCA_WIFI_ISOC) && defined(WMI_INTERFACE_EVENT_LOGGING)) ||\
-		!defined(QCA_CONFIG_SMP)
+#if  defined(WMI_INTERFACE_EVENT_LOGGING) || !defined(QCA_CONFIG_SMP)
 	u_int32_t id;
 	u_int8_t *data;
 #endif
@@ -833,9 +832,6 @@ void wmi_control_rx(void *ctx, HTC_PACKET *htc_packet)
 	}
 #endif /* QCA_CONFIG_SMP */
 
-#ifdef QCA_WIFI_ISOC
-	__wmi_control_rx(wmi_handle, evt_buf);
-#else
 #ifdef WMI_INTERFACE_EVENT_LOGGING
 	id = WMI_GET_FIELD(adf_nbuf_data(evt_buf), WMI_CMD_HDR, COMMANDID);
 	data = adf_nbuf_data(evt_buf);
@@ -849,7 +845,6 @@ void wmi_control_rx(void *ctx, HTC_PACKET *htc_packet)
 	adf_nbuf_queue_add(&wmi_handle->event_queue, evt_buf);
 	adf_os_spin_unlock_bh(&wmi_handle->eventq_lock);
 	schedule_work(&wmi_handle->rx_event_work);
-#endif
 }
 
 void __wmi_control_rx(struct wmi_unified *wmi_handle, wmi_buf_t evt_buf)
@@ -924,7 +919,6 @@ end:
 	adf_nbuf_free(evt_buf);
 }
 
-#ifndef QCA_WIFI_ISOC
 void wmi_rx_event_work(struct work_struct *work)
 {
 	struct wmi_unified *wmi = container_of(work, struct wmi_unified,
@@ -941,7 +935,6 @@ void wmi_rx_event_work(struct work_struct *work)
 		adf_os_spin_unlock_bh(&wmi->eventq_lock);
 	}
 }
-#endif
 
 /* WMI Initialization functions */
 
@@ -958,7 +951,6 @@ wmi_unified_attach(ol_scn_t scn_handle, wma_wow_tx_complete_cbk func)
     wmi_handle->scn_handle = scn_handle;
     adf_os_atomic_init(&wmi_handle->pending_cmds);
     adf_os_atomic_init(&wmi_handle->is_target_suspended);
-#ifndef QCA_WIFI_ISOC
     adf_os_spinlock_init(&wmi_handle->eventq_lock);
     adf_nbuf_queue_init(&wmi_handle->event_queue);
 #ifdef CONFIG_CNSS
@@ -966,7 +958,6 @@ wmi_unified_attach(ol_scn_t scn_handle, wma_wow_tx_complete_cbk func)
 #else
     INIT_WORK(&wmi_handle->rx_event_work, wmi_rx_event_work);
 #endif
-#endif
 #ifdef WMI_INTERFACE_EVENT_LOGGING
     adf_os_spinlock_init(&wmi_handle->wmi_record_lock);
 #endif
@@ -977,7 +968,6 @@ wmi_unified_attach(ol_scn_t scn_handle, wma_wow_tx_complete_cbk func)
 void
 wmi_unified_detach(struct wmi_unified* wmi_handle)
 {
-#ifndef QCA_WIFI_ISOC
     wmi_buf_t buf;
 
     vos_flush_work(&wmi_handle->rx_event_work);
@@ -988,7 +978,6 @@ wmi_unified_detach(struct wmi_unified* wmi_handle)
 	buf = adf_nbuf_queue_remove(&wmi_handle->event_queue);
     }
     adf_os_spin_unlock_bh(&wmi_handle->eventq_lock);
-#endif
     if (wmi_handle != NULL) {
         OS_FREE(wmi_handle);
         wmi_handle = NULL;
diff --git a/CORE/SERVICES/WMI/wmi_unified_priv.h b/CORE/SERVICES/WMI/wmi_unified_priv.h
index c65b5ed5eed1..83a37d6b0fe4 100644
--- a/CORE/SERVICES/WMI/wmi_unified_priv.h
+++ b/CORE/SERVICES/WMI/wmi_unified_priv.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013-2014 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -77,11 +77,9 @@ struct wmi_unified {
 	wmi_unified_event_handler event_handler[WMI_UNIFIED_MAX_EVENT];
 	u_int32_t max_event_idx;
 	void *htc_handle;
-#ifndef QCA_WIFI_ISOC
 	adf_os_spinlock_t eventq_lock;
 	adf_nbuf_queue_t event_queue;
 	struct work_struct rx_event_work;
-#endif
 #ifdef WLAN_OPEN_SOURCE
        struct fwdebug dbglog;
        struct dentry *debugfs_phy;