qcacld-3.0: Clean up code for sme apis

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

Change-Id: I372fcbcf4f96af2c642a5fe93c0f8e2ce98174ea
CRs-Fixed: 3335898

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

@@ -467,4 +467,30 @@ QDF_STATUS
 ucfg_cm_get_neighbor_lookup_rssi_threshold(struct wlan_objmgr_psoc *psoc,
 					   uint8_t vdev_id,
 					   uint8_t *lookup_threshold);
+
+/**
+ * ucfg_cm_get_empty_scan_refresh_period() - get empty scan refresh period
+ * @psoc: pointer to psoc object
+ * @vdev_id: Vdev id
+ * @refresh_threshold: Buffer to fill the empty scan refresh period.
+ *			Valid only if the return status is success.
+ *
+ * Return: QDF_STATUS
+ */
+QDF_STATUS
+ucfg_cm_get_empty_scan_refresh_period(struct wlan_objmgr_psoc *psoc,
+				      uint8_t vdev_id,
+				      uint16_t *refresh_threshold);
+
+/**
+ * ucfg_cm_get_neighbor_scan_min_chan_time() -
+ * get neighbor scan min channel time
+ * @psoc: pointer to psoc object
+ * @session_id: session_id
+ *
+ * Return uint16_t - channel min time value
+ */
+uint16_t
+ucfg_cm_get_neighbor_scan_min_chan_time(struct wlan_objmgr_psoc *psoc,
+					uint8_t session_id);
 #endif /* _WLAN_CM_ROAM_UCFG_API_H_ */

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

@@ -557,3 +557,29 @@ ucfg_cm_get_neighbor_lookup_rssi_threshold(struct wlan_objmgr_psoc *psoc,
 
 	return QDF_STATUS_SUCCESS;
 }
+
+QDF_STATUS
+ucfg_cm_get_empty_scan_refresh_period(struct wlan_objmgr_psoc *psoc,
+				      uint8_t vdev_id,
+				      uint16_t *refresh_threshold)
+{
+	struct cm_roam_values_copy temp;
+
+	wlan_cm_roam_cfg_get_value(psoc, vdev_id,
+				   EMPTY_SCAN_REFRESH_PERIOD, &temp);
+	*refresh_threshold = temp.uint_value;
+
+	return QDF_STATUS_SUCCESS;
+}
+
+uint16_t
+ucfg_cm_get_neighbor_scan_min_chan_time(struct wlan_objmgr_psoc *psoc,
+					uint8_t session_id)
+{
+	struct cm_roam_values_copy temp;
+
+	wlan_cm_roam_cfg_get_value(psoc, session_id,
+				   SCAN_MIN_CHAN_TIME, &temp);
+
+	return temp.uint_value;
+}

core/hdd/src/wlan_hdd_cfg80211.c

@@ -5569,8 +5569,9 @@ hdd_send_roam_scan_period_to_sme(struct hdd_context *hdd_ctx,
 	hdd_debug("Received Command to Set roam scan period (Empty Scan refresh period) = %d",
 		  roam_scan_period);
 
-	status = sme_get_empty_scan_refresh_period(hdd_ctx->mac_handle, vdev_id,
-						   &roam_scan_period_current);
+	status = ucfg_cm_get_empty_scan_refresh_period(
+						hdd_ctx->psoc, vdev_id,
+						&roam_scan_period_current);
 	if (QDF_IS_STATUS_ERROR(status))
 		return status;
 

core/hdd/src/wlan_hdd_ioctl.c

@@ -2882,9 +2882,9 @@ static int drv_cmd_get_roam_scan_period(struct hdd_adapter *adapter,
 	uint8_t len;
 	QDF_STATUS status;
 
-	status = sme_get_empty_scan_refresh_period(hdd_ctx->mac_handle,
-						   adapter->vdev_id,
-						   &empty_scan_refresh_period);
+	status = ucfg_cm_get_empty_scan_refresh_period(
+						hdd_ctx->psoc, adapter->vdev_id,
+						&empty_scan_refresh_period);
 	if (QDF_IS_STATUS_ERROR(status))
 		return qdf_status_to_os_return(status);
 
@@ -3639,8 +3639,9 @@ static int drv_cmd_get_roam_scan_channel_min_time(struct hdd_adapter *adapter,
 						  struct hdd_priv_data *priv_data)
 {
 	int ret = 0;
-	uint16_t val = sme_get_neighbor_scan_min_chan_time(hdd_ctx->mac_handle,
-							   adapter->vdev_id);
+	uint16_t val = ucfg_cm_get_neighbor_scan_min_chan_time(
+							hdd_ctx->psoc,
+							adapter->vdev_id);
 	char extra[32];
 	uint8_t len = 0;
 

core/hdd/src/wlan_hdd_oemdata.c

@@ -104,8 +104,8 @@ static int populate_oem_data_cap(struct hdd_adapter *adapter,
 	data_cap->allowed_dwell_time_min = neighbor_scan_min_chan_time;
 	data_cap->allowed_dwell_time_max = neighbor_scan_max_chan_time;
 	data_cap->curr_dwell_time_min =
-		sme_get_neighbor_scan_min_chan_time(hdd_ctx->mac_handle,
-						    adapter->vdev_id);
+		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);

core/sme/inc/sme_api.h

@@ -1073,18 +1073,6 @@ uint16_t sme_get_neighbor_scan_refresh_period(mac_handle_t mac_handle);
  */
 uint16_t sme_get_empty_scan_refresh_period_global(mac_handle_t mac_handle);
 
-/**
- * sme_get_empty_scan_refresh_period() - get empty scan refresh period
- * @mac_handle: The handle returned by mac_open.
- * @vdev_id: vdev identifier
- * @refresh_threshold: Buffer to fill the empty scan refresh period.
- *		       Valid only if the return status is success.
- *
- * Return: QDF_STATUS
- */
-QDF_STATUS sme_get_empty_scan_refresh_period(mac_handle_t mac_handle,
-					     uint8_t vdev_id,
-					     uint16_t *refresh_threshold);
 QDF_STATUS sme_update_empty_scan_refresh_period(mac_handle_t mac_handle,
 		uint8_t sessionId, uint16_t empty_scan_refresh_period);
 /**
@@ -1141,8 +1129,6 @@ QDF_STATUS sme_set_neighbor_scan_min_chan_time(mac_handle_t mac_handle,
 QDF_STATUS sme_set_neighbor_scan_max_chan_time(mac_handle_t mac_handle,
 				uint8_t sessionId,
 				const uint16_t nNeighborScanMaxChanTime);
-uint16_t sme_get_neighbor_scan_min_chan_time(mac_handle_t mac_handle,
-					     uint8_t sessionId);
 uint32_t sme_get_current_roam_state(mac_handle_t mac_handle, uint8_t sessionId);
 uint32_t sme_get_current_roam_sub_state(mac_handle_t mac_handle,
 					uint8_t sessionId);

core/sme/src/common/sme_api.c

@@ -6651,20 +6651,6 @@ uint16_t sme_get_empty_scan_refresh_period_global(mac_handle_t mac_handle)
 	return mac->mlme_cfg->lfr.empty_scan_refresh_period;
 }
 
-QDF_STATUS sme_get_empty_scan_refresh_period(mac_handle_t mac_handle,
-					     uint8_t vdev_id,
-					     uint16_t *refresh_threshold)
-{
-	struct mac_context *mac = MAC_CONTEXT(mac_handle);
-	struct cm_roam_values_copy temp;
-
-	wlan_cm_roam_cfg_get_value(mac->psoc, vdev_id,
-				   EMPTY_SCAN_REFRESH_PERIOD, &temp);
-	*refresh_threshold = temp.uint_value;
-
-	return QDF_STATUS_SUCCESS;
-}
-
 /*
  * sme_update_empty_scan_refresh_period
  * Update empty_scan_refresh_period
@@ -6782,25 +6768,6 @@ QDF_STATUS sme_set_neighbor_scan_max_chan_time(mac_handle_t mac_handle,
 					  SCAN_MAX_CHAN_TIME, &src_config);
 }
 
-/*
- * sme_get_neighbor_scan_min_chan_time() -
- * get neighbor scan min channel time
- *
- * mac_handle - The handle returned by mac_open.
- * sessionId - Session Identifier
- * Return uint16_t - channel min time value
- */
-uint16_t sme_get_neighbor_scan_min_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_MIN_CHAN_TIME, &temp);
-	return temp.uint_value;
-}
-
 /*
  * sme_get_current_roam_state() -
  * get current roam state