From e847690fe7b5437b389562e8eea5474b7d718b98 Mon Sep 17 00:00:00 2001
From: Dustin Brown <dustinb@codeaurora.org>
Date: Thu, 17 Aug 2017 10:50:58 -0700
Subject: [PATCH] qcacld-3.0: Refactor pmo_unpause_all_vdev

Refactor pmo_unpause_all_vdev to remove nested conditional compilation.

Change-Id: I17edcbb791c722a7fcb98d3dce71c82406281003
CRs-Fixed: 2094604
---
 .../pmo/core/src/wlan_pmo_suspend_resume.c    | 43 ++++++++-----------
 1 file changed, 18 insertions(+), 25 deletions(-)

diff --git a/components/pmo/core/src/wlan_pmo_suspend_resume.c b/components/pmo/core/src/wlan_pmo_suspend_resume.c
index 8cceadcc293f..202723990c44 100644
--- a/components/pmo/core/src/wlan_pmo_suspend_resume.c
+++ b/components/pmo/core/src/wlan_pmo_suspend_resume.c
@@ -452,6 +452,7 @@ static void pmo_core_set_resume_dtim(struct wlan_objmgr_psoc *psoc)
 	}
 }
 
+#if defined(QCA_LL_LEGACY_TX_FLOW_CONTROL) || defined(QCA_LL_TX_FLOW_CONTROL_V2)
 /**
  * pmo_unpause_vdev - unpause all vdev
  * @psoc: objmgr psoc handle
@@ -461,41 +462,33 @@ static void pmo_core_set_resume_dtim(struct wlan_objmgr_psoc *psoc)
  * Return: none
  */
 static void pmo_unpause_all_vdev(struct wlan_objmgr_psoc *psoc,
-		struct pmo_psoc_priv_obj *psoc_ctx)
+				 struct pmo_psoc_priv_obj *psoc_ctx)
 {
 	uint8_t vdev_id;
-	struct wlan_objmgr_psoc_objmgr *objmgr;
 	struct wlan_objmgr_vdev *vdev;
 
 	/* Iterate through VDEV list */
 	for (vdev_id = 0; vdev_id < WLAN_UMAC_PSOC_MAX_VDEVS; vdev_id++) {
-		wlan_psoc_obj_lock(psoc);
-		objmgr = &psoc->soc_objmgr;
-		if (!objmgr->wlan_vdev_list[vdev_id]) {
-			wlan_psoc_obj_unlock(psoc);
+		vdev = pmo_psoc_get_vdev(psoc, vdev_id);
+		if (!vdev)
 			continue;
-		}
-		vdev = objmgr->wlan_vdev_list[vdev_id];
-		wlan_psoc_obj_unlock(psoc);
-		if (vdev) {
-#if defined(QCA_LL_LEGACY_TX_FLOW_CONTROL) || defined(QCA_LL_TX_FLOW_CONTROL_V2)
-			/*
-			 * When host resume, by default,
-			 * unpause all active vdev
-			 */
-			if (pmo_core_vdev_get_pause_bitmap(psoc_ctx, vdev_id)) {
-				cdp_fc_vdev_unpause(
-					pmo_core_psoc_get_dp_handle(psoc),
-					pmo_core_vdev_get_dp_handle(vdev),
-					0xffffffff);
-				if (psoc_ctx->pause_bitmap_notifier)
-					psoc_ctx->pause_bitmap_notifier(vdev_id,
-							0);
-			}
-#endif /* QCA_LL_LEGACY_TX_FLOW_CONTROL */
+
+		/* When host resumes, by default unpause all active vdev */
+		if (pmo_core_vdev_get_pause_bitmap(psoc_ctx, vdev_id)) {
+			cdp_fc_vdev_unpause(pmo_core_psoc_get_dp_handle(psoc),
+					    pmo_core_vdev_get_dp_handle(vdev),
+					    0xffffffff);
+			if (psoc_ctx->pause_bitmap_notifier)
+				psoc_ctx->pause_bitmap_notifier(vdev_id, 0);
 		}
 	}
 }
+#else
+static inline void pmo_unpause_all_vdev(struct wlan_objmgr_psoc *psoc,
+					struct pmo_psoc_priv_obj *psoc_ctx)
+{
+}
+#endif /* QCA_LL_LEGACY_TX_FLOW_CONTROL */
 
 /**
  * pmo_core_psoc_configure_resume(): configure events after bus resume