From 175e4f91fdb11d92194c7ffd618756aec81a61d9 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <jjohnson@codeaurora.org>
Date: Mon, 10 Dec 2018 16:54:14 -0800
Subject: [PATCH] qcacld-3.0: Remove Suspend & Resume remnants from WMA

Previously change Iba16643adf1cbd997138c740345e40c00c8e81f6
("qcacld-3.0: Add Suspend and Resume support in PMO") relocated
Suspend/Resume support from WMA to PMO. However that change left
behind in WMA some remnants that are no longer useful such as the
wma_resume_event, so remove them.

Change-Id: Icf35bafd8fdacdbdc71cfb4309a8bd15bfb1a244
CRs-Fixed: 2365057
---
 core/wma/inc/wma.h      | 6 ------
 core/wma/src/wma_main.c | 9 ---------
 2 files changed, 15 deletions(-)

diff --git a/core/wma/inc/wma.h b/core/wma/inc/wma.h
index 5c563d9a7e..3d3055b5eb 100644
--- a/core/wma/inc/wma.h
+++ b/core/wma/inc/wma.h
@@ -994,7 +994,6 @@ struct wma_valid_channels {
  * @mac_context: mac context
  * @psoc: psoc context
  * @pdev: physical device global object
- * @wma_resume_event: wma resume event
  * @target_suspend: target suspend event
  * @recovery_event: wma FW recovery event
  * @max_station: max stations
@@ -1031,8 +1030,6 @@ struct wma_valid_channels {
  * @vht_supp_mcs: VHT supported MCS
  * @is_fw_assert: is fw asserted
  * @wow: wow related patterns & parameters
- * @no_of_suspend_ind: number of suspend indications
- * @no_of_resume_ind: number of resume indications
  * @ack_work_ctx: Context for deferred processing of TX ACK
  * @powersave_mode: power save mode
  * @ptrn_match_enable_all_vdev: is pattern match is enable/disable
@@ -1141,7 +1138,6 @@ typedef struct {
 	void *mac_context;
 	struct wlan_objmgr_psoc *psoc;
 	struct wlan_objmgr_pdev *pdev;
-	qdf_event_t wma_resume_event;
 	qdf_event_t target_suspend;
 	qdf_event_t runtime_suspend;
 	qdf_event_t recovery_event;
@@ -1179,8 +1175,6 @@ typedef struct {
 	uint32_t vht_supp_mcs;
 	uint8_t is_fw_assert;
 	struct wma_wow wow;
-	uint8_t no_of_suspend_ind;
-	uint8_t no_of_resume_ind;
 	struct wma_tx_ack_work_ctx *ack_work_ctx;
 	uint8_t powersave_mode;
 	bool ptrn_match_enable_all_vdev;
diff --git a/core/wma/src/wma_main.c b/core/wma/src/wma_main.c
index be8a896d65..b506248ba3 100644
--- a/core/wma/src/wma_main.c
+++ b/core/wma/src/wma_main.c
@@ -1984,7 +1984,6 @@ static void wma_shutdown_notifier_cb(void *priv)
 	struct scheduler_msg msg = { 0 };
 	QDF_STATUS status;
 
-	qdf_event_set(&wma_handle->wma_resume_event);
 	ucfg_pmo_psoc_wakeup_host_event_received(wma_handle->psoc);
 	wmi_stop(wma_handle->wmi_handle);
 
@@ -3395,13 +3394,6 @@ QDF_STATUS wma_open(struct wlan_objmgr_psoc *psoc,
 		goto err_event_init;
 	}
 
-	qdf_status = qdf_event_create(&wma_handle->wma_resume_event);
-	if (qdf_status != QDF_STATUS_SUCCESS) {
-		WMA_LOGE("%s: wma_resume_event initialization failed",
-			 __func__);
-		goto err_event_init;
-	}
-
 	qdf_status = cds_shutdown_notifier_register(wma_shutdown_notifier_cb,
 						    wma_handle);
 	if (qdf_status != QDF_STATUS_SUCCESS) {
@@ -4794,7 +4786,6 @@ QDF_STATUS wma_close(void)
 			__func__);
 
 	qdf_event_destroy(&wma_handle->target_suspend);
-	qdf_event_destroy(&wma_handle->wma_resume_event);
 	qdf_event_destroy(&wma_handle->runtime_suspend);
 	qdf_event_destroy(&wma_handle->recovery_event);
 	qdf_event_destroy(&wma_handle->tx_frm_download_comp_event);