commit b3b15f43cd5693eab02c81bd25cd8bd701129ce5
author Yue Ma <yuem@codeaurora.org> Wed Aug 31 11:09:23 2016 -0700
committer Prakash Dhavali <pdhavali@codeaurora.org> Thu Nov 03 17:54:05 2016 -0700
tree d2418159cec52963b70980d4265b5a38c71b1142
parent 5b933dcaf4f0ab481bb259a95640133bee28f842

qcacld-3.0: Remove CONFIG_CNSS flag in WMA

Platform driver flags should be hiden behind PLD layer only. Hence
remove them in WMA layer.

Change-Id: Icee457715bd26e23c489dfefd35999b278ff68c0
CRs-fixed: 1082183

core/wma/src/wma_features.c

diff --git a/core/wma/src/wma_features.c b/core/wma/src/wma_features.c
index 80c4ab3..2a4b66f 100644
--- a/core/wma/src/wma_features.c
+++ b/core/wma/src/wma_features.c
@@ -3842,14 +3842,12 @@
 	int wmi_pending_cmds;
 	struct wow_cmd_params param = {0};
 
-#ifdef CONFIG_CNSS
 	tpAniSirGlobal pMac = cds_get_context(QDF_MODULE_ID_PE);
 
 	if (NULL == pMac) {
 		WMA_LOGE("%s: Unable to get PE context", __func__);
 		return QDF_STATUS_E_FAILURE;
 	}
-#endif /* CONFIG_CNSS */
 
 	qdf_event_reset(&wma->target_suspend);
 	wma->wow_nack = false;
@@ -3889,15 +3887,11 @@
 			 wmi_get_pending_cmds(wma->wmi_handle));
 		wmi_set_target_suspend(wma->wmi_handle, false);
 		if (!cds_is_driver_recovering()) {
-#ifdef CONFIG_CNSS
 			if (pMac->sme.enableSelfRecovery) {
 				cds_trigger_recovery();
 			} else {
 				QDF_BUG(0);
 			}
-#else
-			QDF_BUG(0);
-#endif /* CONFIG_CNSS */
 		} else {
 			WMA_LOGE("%s: LOGP is in progress, ignore!", __func__);
 		}
@@ -4594,13 +4588,11 @@
 {
 	QDF_STATUS qdf_status = QDF_STATUS_SUCCESS;
 	int ret;
-#ifdef CONFIG_CNSS
 	tpAniSirGlobal pMac = cds_get_context(QDF_MODULE_ID_PE);
 	if (NULL == pMac) {
 		WMA_LOGE("%s: Unable to get PE context", __func__);
 		return QDF_STATUS_E_FAILURE;
 	}
-#endif /* CONFIG_CNSS */
 
 	qdf_event_reset(&wma->wma_resume_event);
 
@@ -4620,15 +4612,11 @@
 			 wmi_get_pending_cmds(wma->wmi_handle),
 			 wmi_get_host_credits(wma->wmi_handle));
 		if (!cds_is_driver_recovering()) {
-#ifdef CONFIG_CNSS
 			if (pMac->sme.enableSelfRecovery) {
 				cds_trigger_recovery();
 			} else {
 				QDF_BUG(0);
 			}
-#else
-			QDF_BUG(0);
-#endif /* CONFIG_CNSS */
 		} else {
 			WMA_LOGE("%s: SSR in progress, ignore resume timeout",
 				 __func__);
@@ -6732,13 +6720,11 @@
 {
 	tp_wma_handle wma = (tp_wma_handle) handle;
 	QDF_STATUS qdf_status = QDF_STATUS_SUCCESS;
-#ifdef CONFIG_CNSS
 	tpAniSirGlobal pMac = cds_get_context(QDF_MODULE_ID_PE);
 	if (NULL == pMac) {
 		WMA_LOGE("%s: Unable to get PE context", __func__);
 		return QDF_STATUS_E_INVAL;
 	}
-#endif /* CONFIG_CNSS */
 
 	qdf_event_reset(&wma->wma_resume_event);
 	qdf_status = wmi_unified_resume_send(wma->wmi_handle,
@@ -6755,15 +6741,11 @@
 			wmi_get_pending_cmds(wma->wmi_handle),
 			wmi_get_host_credits(wma->wmi_handle));
 		if (!cds_is_driver_recovering()) {
-#ifdef CONFIG_CNSS
 			if (pMac->sme.enableSelfRecovery) {
 				cds_trigger_recovery();
 			} else {
 				QDF_BUG(0);
 			}
-#else
-			QDF_BUG(0);
-#endif /* CONFIG_CNSS */
 		} else {
 			WMA_LOGE("%s: SSR in progress, ignore resume timeout",
 				__func__);