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
diff --git a/core/wma/src/wma_utils.c b/core/wma/src/wma_utils.c
index aa1938a..65bb534 100644
--- a/core/wma/src/wma_utils.c
+++ b/core/wma/src/wma_utils.c
@@ -4285,12 +4285,27 @@
*/
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 @@
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,