From 5daec820b0b3c7732d6232dc840dc4ae382378a4 Mon Sep 17 00:00:00 2001
From: Sourav Mohapatra <mohapatr@codeaurora.org>
Date: Tue, 10 Jul 2018 14:40:06 +0530
Subject: [PATCH] qcacld-3.0: Remove wma_is_service_enable API

The API wma_is_service_enable is a wrapper on the converged
wmi_service_enabled API for services and extended services. The checks
used in the API are not updated for the converged service enum.

Replace wma_is_service_enable with wmi_service_enabled as there is no
need to have a wrapper

Change-Id: I4fe3601f7e1a031290e139f9ef55f845965b7b2e
CRs-Fixed: 2276471
---
 core/wma/inc/wma_api.h   |  2 --
 core/wma/src/wma_main.c  | 17 +++++++++++------
 core/wma/src/wma_utils.c | 35 +++++++++++++++++------------------
 3 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/core/wma/inc/wma_api.h b/core/wma/inc/wma_api.h
index 19278457baf0..badc36730511 100644
--- a/core/wma/inc/wma_api.h
+++ b/core/wma/inc/wma_api.h
@@ -313,8 +313,6 @@ QDF_STATUS wma_set_sar_limit(WMA_HANDLE handle,
  */
 QDF_STATUS wma_set_qpower_config(uint8_t vdev_id, uint8_t qpower);
 
-bool wma_is_service_enabled(uint32_t service_type);
-
 #ifdef FEATURE_WLAN_D0WOW
 static inline bool wma_d0_wow_is_supported(void)
 {
diff --git a/core/wma/src/wma_main.c b/core/wma/src/wma_main.c
index 2fc526983dba..49a4a4f55d1b 100644
--- a/core/wma/src/wma_main.c
+++ b/core/wma/src/wma_main.c
@@ -5600,19 +5600,24 @@ static void wma_update_ra__limit(tp_wma_handle handle)
 static void wma_set_pmo_caps(struct wlan_objmgr_psoc *psoc)
 {
 	QDF_STATUS status;
+	tp_wma_handle wma;
 	struct pmo_device_caps caps;
 
+	wma = cds_get_context(QDF_MODULE_ID_WMA);
 	caps.arp_ns_offload =
-		wma_is_service_enabled(wmi_service_arpns_offload);
+		wmi_service_enabled(wma->wmi_handle, wmi_service_arpns_offload);
 	caps.apf =
-		wma_is_service_enabled(wmi_service_apf_offload);
+		wmi_service_enabled(wma->wmi_handle, wmi_service_apf_offload);
 	caps.packet_filter =
-		wma_is_service_enabled(wmi_service_packet_filter_offload);
+		wmi_service_enabled(wma->wmi_handle,
+				    wmi_service_packet_filter_offload);
 	caps.unified_wow =
-		wma_is_service_enabled(wmi_service_unified_wow_capability);
+		wmi_service_enabled(wma->wmi_handle,
+				    wmi_service_unified_wow_capability);
 	caps.li_offload =
-		wma_is_service_enabled(
-				wmi_service_listen_interval_offload_support);
+		wmi_service_enabled(wma->wmi_handle,
+				    wmi_service_listen_interval_offload_support
+				    );
 
 	status = ucfg_pmo_psoc_set_caps(psoc, &caps);
 	if (QDF_IS_STATUS_ERROR(status))
diff --git a/core/wma/src/wma_utils.c b/core/wma/src/wma_utils.c
index aa1938ae73a4..65bb5348cb8d 100644
--- a/core/wma/src/wma_utils.c
+++ b/core/wma/src/wma_utils.c
@@ -4285,12 +4285,27 @@ wma_config_debug_module_cmd(wmi_unified_t wmi_handle, A_UINT32 param,
  */
 bool wma_is_p2p_lo_capable(void)
 {
-	return wma_is_service_enabled(wmi_service_p2p_listen_offload_support);
+	tp_wma_handle wma = cds_get_context(QDF_MODULE_ID_WMA);
+
+	if (wma) {
+		return wmi_service_enabled
+				(wma->wmi_handle,
+				 wmi_service_p2p_listen_offload_support);
+	}
+
+	return 0;
 }
 
 bool wma_capability_enhanced_mcast_filter(void)
 {
-	return wma_is_service_enabled(wmi_service_enhanced_mcast_filter);
+	tp_wma_handle wma = cds_get_context(QDF_MODULE_ID_WMA);
+
+	if (wma) {
+		return wmi_service_enabled(wma->wmi_handle,
+					   wmi_service_enhanced_mcast_filter);
+	}
+
+	return 0;
 }
 
 
@@ -4453,23 +4468,7 @@ int wma_rcpi_event_handler(void *handle, uint8_t *cmd_param_info,
 	return 0;
 }
 
-bool wma_is_service_enabled(uint32_t service_type)
-{
-	tp_wma_handle wma;
 
-	wma = cds_get_context(QDF_MODULE_ID_WMA);
-	if (!wma) {
-		WMA_LOGE("%s: Invalid WMA handle", __func__);
-		return false;
-	}
-
-	if (service_type >= WMI_MAX_SERVICE) {
-		WMA_LOGE("%s: Invalid service type %d", __func__, service_type);
-		return false;
-	}
-
-	return wmi_service_enabled(wma->wmi_handle, service_type);
-}
 
 QDF_STATUS wma_send_vdev_up_to_fw(t_wma_handle *wma,
 				  struct vdev_up_params *params,