qcacld-3.0: Clean up code for sme apis

Clean up code for sme_get_neighbor_scan_max_chan_time() and
sme_get_neighbor_scan_max_chan_time() apis and replace it with ucfg api.

Change-Id: I8a9de18f22e352ed8c64f415fd0455f64227a857
CRs-Fixed: 3335898

components/umac/mlme/connection_mgr/dispatcher/inc/wlan_cm_roam_ucfg_api.h

@@ -438,7 +438,7 @@ ucfg_cm_get_sae_auth_ta(struct wlan_objmgr_pdev *pdev,
  * @psoc: pointer to psoc object
  * @val:  Infra band value
  *
- * Return Success or failure
+ * Return: Success or failure
  */
 QDF_STATUS
 ucfg_cm_get_roam_intra_band(struct wlan_objmgr_psoc *psoc, uint16_t *val);
@@ -488,7 +488,7 @@ ucfg_cm_get_empty_scan_refresh_period(struct wlan_objmgr_psoc *psoc,
  * @psoc: pointer to psoc object
  * @session_id: session_id
  *
- * Return uint16_t - channel min time value
+ * Return: channel min time value
  */
 uint16_t
 ucfg_cm_get_neighbor_scan_min_chan_time(struct wlan_objmgr_psoc *psoc,
@@ -513,7 +513,7 @@ ucfg_cm_get_roam_rssi_diff(struct wlan_objmgr_psoc *psoc, uint8_t vdev_id,
  * This is a synchronous call
  * @psoc: pointer to psoc object
  *
- * Return true (1) - if the ESE feature is enabled
+ * Return: true (1) - if the ESE feature is enabled
  *	false (0) - if feature is disabled (compile or runtime)
  */
 bool
@@ -526,4 +526,26 @@ ucfg_cm_get_is_ese_feature_enabled(struct wlan_objmgr_psoc *psoc)
 }
 #endif
 
+/**
+ * ucfg_cm_get_neighbor_scan_max_chan_time() - get neighbor
+ * scan max channel time
+ * @psoc: pointer to psoc object
+ * @vdev_id: vdev identifier
+ *
+ * Return: channel max time value
+ */
+uint16_t
+ucfg_cm_get_neighbor_scan_max_chan_time(struct wlan_objmgr_psoc *psoc,
+					uint8_t vdev_id);
+
+/**
+ * ucfg_cm_get_neighbor_scan_period() - get neighbor scan period
+ * @psoc: pointer to psoc object
+ * @vdev_id: vdev identifier
+ *
+ * Return: neighbor scan period
+ */
+uint16_t
+ucfg_cm_get_neighbor_scan_period(struct wlan_objmgr_psoc *psoc,
+				 uint8_t vdev_id);
 #endif /* _WLAN_CM_ROAM_UCFG_API_H_ */

components/umac/mlme/connection_mgr/dispatcher/src/wlan_cm_roam_ucfg_api.c

@@ -609,3 +609,26 @@ bool ucfg_cm_get_is_ese_feature_enabled(struct wlan_objmgr_psoc *psoc)
 	return mlme_obj->cfg.lfr.ese_enabled;
 }
 #endif
+
+uint16_t
+ucfg_cm_get_neighbor_scan_max_chan_time(struct wlan_objmgr_psoc *psoc,
+					uint8_t vdev_id)
+{
+	struct cm_roam_values_copy temp;
+
+	wlan_cm_roam_cfg_get_value(psoc, vdev_id,
+				   SCAN_MAX_CHAN_TIME, &temp);
+
+	return temp.uint_value;
+}
+
+uint16_t
+ucfg_cm_get_neighbor_scan_period(struct wlan_objmgr_psoc *psoc,
+				 uint8_t vdev_id)
+{
+	struct cm_roam_values_copy temp;
+
+	wlan_cm_roam_cfg_get_value(psoc, vdev_id,
+				   NEIGHBOR_SCAN_PERIOD, &temp);
+	return temp.uint_value;
+}

core/hdd/src/wlan_hdd_ioctl.c

@@ -3716,8 +3716,9 @@ static int drv_cmd_get_scan_channel_time(struct hdd_adapter *adapter,
 					 struct hdd_priv_data *priv_data)
 {
 	int ret = 0;
-	uint16_t val = sme_get_neighbor_scan_max_chan_time(hdd_ctx->mac_handle,
-							   adapter->vdev_id);
+	uint16_t val = ucfg_cm_get_neighbor_scan_max_chan_time(
+							hdd_ctx->psoc,
+							adapter->vdev_id);
 	char extra[32];
 	uint8_t len = 0;
 
@@ -3789,8 +3790,8 @@ static int drv_cmd_get_scan_home_time(struct hdd_adapter *adapter,
 				      struct hdd_priv_data *priv_data)
 {
 	int ret = 0;
-	uint16_t val = sme_get_neighbor_scan_period(hdd_ctx->mac_handle,
-						    adapter->vdev_id);
+	uint16_t val = ucfg_cm_get_neighbor_scan_period(hdd_ctx->psoc,
+							adapter->vdev_id);
 	char extra[32];
 	uint8_t len = 0;
 

core/hdd/src/wlan_hdd_oemdata.c

@@ -107,8 +107,8 @@ static int populate_oem_data_cap(struct hdd_adapter *adapter,
 		ucfg_cm_get_neighbor_scan_min_chan_time(hdd_ctx->psoc,
 							adapter->vdev_id);
 	data_cap->curr_dwell_time_max =
-		sme_get_neighbor_scan_max_chan_time(hdd_ctx->mac_handle,
-						    adapter->vdev_id);
+		ucfg_cm_get_neighbor_scan_max_chan_time(hdd_ctx->psoc,
+							adapter->vdev_id);
 	data_cap->supported_bands = band_capability;
 
 	/* request for max num of channels */

core/sme/inc/sme_api.h

@@ -1139,13 +1139,9 @@ uint32_t sme_get_lim_sme_session_state(mac_handle_t mac_handle,
 				       uint8_t sessionId);
 uint32_t sme_get_lim_mlm_session_state(mac_handle_t mac_handle,
 				       uint8_t sessionId);
-uint16_t sme_get_neighbor_scan_max_chan_time(mac_handle_t mac_handle,
-					     uint8_t sessionId);
 QDF_STATUS sme_set_neighbor_scan_period(mac_handle_t mac_handle,
 		uint8_t sessionId,
 		const uint16_t nNeighborScanPeriod);
-uint16_t sme_get_neighbor_scan_period(mac_handle_t mac_handle,
-				      uint8_t sessionId);
 QDF_STATUS sme_set_roam_bmiss_first_bcnt(mac_handle_t mac_handle,
 		uint8_t sessionId, const uint8_t nRoamBmissFirstBcnt);
 QDF_STATUS sme_set_roam_bmiss_final_bcnt(mac_handle_t mac_handle,

core/sme/src/common/sme_api.c

@@ -6877,26 +6877,6 @@ uint32_t sme_get_lim_mlm_session_state(mac_handle_t mac_handle,
 	return mac->lim.gpSession[sessionId].limMlmState;
 }
 
-/*
- * sme_get_neighbor_scan_max_chan_time() -
- *   get neighbor scan max channel time
- *
- * mac_handle - The handle returned by mac_open.
- * sessionId - Session Identifier
- * Return uint16_t - channel max time value
- */
-uint16_t sme_get_neighbor_scan_max_chan_time(mac_handle_t mac_handle,
-					     uint8_t sessionId)
-{
-	struct mac_context *mac = MAC_CONTEXT(mac_handle);
-	struct cm_roam_values_copy temp;
-
-	wlan_cm_roam_cfg_get_value(mac->psoc, sessionId,
-				   SCAN_MAX_CHAN_TIME, &temp);
-	return temp.uint_value;
-
-}
-
 /*
  * sme_set_neighbor_scan_period() -
  *  Update nNeighborScanPeriod
@@ -6923,25 +6903,6 @@ QDF_STATUS sme_set_neighbor_scan_period(mac_handle_t mac_handle,
 					  &src_config);
 }
 
-/*
- * sme_get_neighbor_scan_period() -
- *   get neighbor scan period
- *
- * mac_handle - The handle returned by mac_open.
- * sessionId - Session Identifier
- * Return uint16_t - neighbor scan period
- */
-uint16_t sme_get_neighbor_scan_period(mac_handle_t mac_handle,
-				      uint8_t sessionId)
-{
-	struct mac_context *mac = MAC_CONTEXT(mac_handle);
-	struct cm_roam_values_copy temp;
-
-	wlan_cm_roam_cfg_get_value(mac->psoc, sessionId,
-				   NEIGHBOR_SCAN_PERIOD, &temp);
-	return temp.uint_value;
-}
-
 static bool sme_validate_freq_list(mac_handle_t mac_handle,
 				   uint32_t *freq_list,
 				   uint8_t num_channels)