qcacld-3.0: Replace obsolete TWT function

Obsolete TWT functions are still called in driver. As part of
removal, Remove these functions and use component function.

Change-Id: I9f8b4186753ec9d446399be9e1cfc03a63a17391
CRs-Fixed: 3294868

components/mlme/core/src/wlan_mlme_main.c

@@ -33,6 +33,7 @@
 #include "wlan_mlme_ucfg_api.h"
 #include "wifi_pos_ucfg_i.h"
 #include "wlan_mlo_mgr_sta.h"
+#include "twt/core/src/wlan_twt_cfg.h"
 
 #define NUM_OF_SOUNDING_DIMENSIONS     1 /*Nss - 1, (Nss = 2 for 2x2)*/
 
@@ -1258,6 +1259,7 @@ static void mlme_init_he_cap_in_cfg(struct wlan_objmgr_psoc *psoc,
 	uint32_t chan_width, mcs_12_13;
 	uint16_t value = 0;
 	struct wlan_mlme_he_caps *he_caps = &mlme_cfg->he_caps;
+	bool is_twt_enabled = false;
 
 	he_caps->dot11_he_cap.htc_he = cfg_default(CFG_HE_CONTROL);
 	he_caps->dot11_he_cap.twt_request =
@@ -1270,9 +1272,12 @@ static void mlme_init_he_cap_in_cfg(struct wlan_objmgr_psoc *psoc,
 	 * role and "twt_bcast_req_resp_config" ini
 	 */
 	he_caps->dot11_he_cap.broadcast_twt = 0;
-	if (mlme_is_twt_enabled(psoc))
+
+	is_twt_enabled = wlan_twt_cfg_is_twt_enabled(psoc);
+
+	if (is_twt_enabled)
 		he_caps->dot11_he_cap.flex_twt_sched =
-				cfg_default(CFG_HE_FLEX_TWT_SCHED);
+			cfg_default(CFG_HE_FLEX_TWT_SCHED);
 	he_caps->dot11_he_cap.fragmentation =
 			cfg_default(CFG_HE_FRAGMENTATION);
 	he_caps->dot11_he_cap.max_num_frag_msdu_amsdu_exp =

components/umac/twt/dispatcher/src/wlan_twt_cfg_ext_api.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -18,7 +18,6 @@
 #include <wlan_twt_cfg_ext_api.h>
 #include "twt/core/src/wlan_twt_cfg.h"
 #include "wlan_mlme_api.h"
-#include "wlan_mlme_twt_api.h"
 
 QDF_STATUS
 wlan_twt_cfg_get_req_flag(struct wlan_objmgr_psoc *psoc, bool *val)
@@ -60,7 +59,7 @@ wlan_twt_cfg_get_support_requestor(struct wlan_objmgr_psoc *psoc, bool *val)
 void wlan_twt_get_feature_info(struct wlan_objmgr_psoc *psoc,
 			       struct wlan_twt_features *twt_feature_set)
 {
-	twt_feature_set->enable_twt = mlme_is_twt_enabled(psoc);
+	twt_feature_set->enable_twt = wlan_twt_cfg_is_twt_enabled(psoc);
 	if (twt_feature_set->enable_twt) {
 		wlan_twt_cfg_get_bcast_requestor(
 					psoc,
@@ -68,8 +67,6 @@ void wlan_twt_get_feature_info(struct wlan_objmgr_psoc *psoc,
 		wlan_twt_cfg_get_requestor(
 					psoc,
 					&twt_feature_set->enable_twt_requester);
-		twt_feature_set->enable_twt_flexible =
-					mlme_is_flexible_twt_enabled(psoc);
 	}
 }
 #endif