qcacld-3.0: Clean up code for sme apis

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

Change-Id: I7de3bf3faff990cbf667cb8106044a33f16f3a46
CRs-Fixed: 3335898

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

@@ -578,4 +578,31 @@ bool ucfg_cm_get_is_lfr_feature_enabled(struct wlan_objmgr_psoc *psoc);
  */
 bool ucfg_cm_get_is_ft_feature_enabled(struct wlan_objmgr_psoc *psoc);
 
+/**
+ * ucfg_cm_get_roam_scan_home_away_time() - Get Roam scan home away time
+ * @psoc: Pointer to psoc
+ * @vdev_id: vdev identifier
+ * @roam_scan_home_away_time: Buffer to fill the roam scan home away time.
+ *				Valid only if the return status is success.
+ *
+ * Return: QDF_STATUS
+ */
+QDF_STATUS
+ucfg_cm_get_roam_scan_home_away_time(struct wlan_objmgr_psoc *psoc,
+				     uint8_t vdev_id,
+				     uint16_t *roam_scan_home_away_time);
+/**
+ * ucfg_cm_get_roam_opportunistic_scan_threshold_diff() -
+ * get Opportunistic Scan threshold diff.
+ * This is a synchronous call
+ * @psoc: Pointer to psoc
+ * @val: Opportunistic Scan threshold diff.
+ *
+ * Return: QDF_STATUS
+ */
+QDF_STATUS
+ucfg_cm_get_roam_opportunistic_scan_threshold_diff(
+					struct wlan_objmgr_psoc *psoc,
+					int8_t *val);
+
 #endif /* _WLAN_CM_ROAM_UCFG_API_H_ */

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

@@ -665,3 +665,33 @@ bool ucfg_cm_get_is_ft_feature_enabled(struct wlan_objmgr_psoc *psoc)
 
 	return mlme_obj->cfg.lfr.fast_transition_enabled;
 }
+
+QDF_STATUS
+ucfg_cm_get_roam_scan_home_away_time(struct wlan_objmgr_psoc *psoc,
+				     uint8_t vdev_id,
+				     uint16_t *roam_scan_home_away_time)
+{
+	struct cm_roam_values_copy temp;
+
+	wlan_cm_roam_cfg_get_value(psoc, vdev_id, SCAN_HOME_AWAY, &temp);
+
+	*roam_scan_home_away_time = temp.uint_value;
+
+	return QDF_STATUS_SUCCESS;
+}
+
+QDF_STATUS
+ucfg_cm_get_roam_opportunistic_scan_threshold_diff(
+						struct wlan_objmgr_psoc *psoc,
+						int8_t *val)
+{
+	struct wlan_mlme_psoc_ext_obj *mlme_obj;
+
+	mlme_obj = mlme_get_psoc_ext_obj(psoc);
+	if (!mlme_obj)
+		return QDF_STATUS_E_INVAL;
+
+	*val = mlme_obj->cfg.lfr.opportunistic_scan_threshold_diff;
+
+	return QDF_STATUS_SUCCESS;
+}

core/hdd/src/wlan_hdd_ioctl.c

@@ -4020,9 +4020,9 @@ static int drv_cmd_get_scan_home_away_time(struct hdd_adapter *adapter,
 	uint8_t len = 0;
 	QDF_STATUS status;
 
-	status = sme_get_roam_scan_home_away_time(hdd_ctx->mac_handle,
-						  adapter->vdev_id,
-						  &val);
+	status = ucfg_cm_get_roam_scan_home_away_time(hdd_ctx->psoc,
+						      adapter->vdev_id,
+						      &val);
 	if (QDF_IS_STATUS_ERROR(status))
 		return qdf_status_to_os_return(status);
 
@@ -4149,11 +4149,11 @@ static int drv_cmd_get_opportunistic_rssi_diff(struct hdd_adapter *adapter,
 					       struct hdd_priv_data *priv_data)
 {
 	int ret = 0;
-	mac_handle_t mac_handle = hdd_ctx->mac_handle;
-	int8_t val = sme_get_roam_opportunistic_scan_threshold_diff(mac_handle);
+	int8_t val = 0;
 	char extra[32];
 	uint8_t len = 0;
 
+	ucfg_cm_get_roam_opportunistic_scan_threshold_diff(hdd_ctx->psoc, &val);
 	len = scnprintf(extra, sizeof(extra), "%s %d", command, val);
 	len = QDF_MIN(priv_data->total_len, len + 1);
 	if (copy_to_user(priv_data->buf, &extra, len)) {

core/sme/inc/sme_api.h

@@ -996,18 +996,6 @@ QDF_STATUS sme_get_roam_scan_n_probes(mac_handle_t mac_handle, uint8_t vdev_id,
 QDF_STATUS sme_update_roam_rssi_diff(mac_handle_t mac_handle, uint8_t vdev_id,
 				     uint8_t roam_rssi_diff);
 
-/**
- * sme_get_roam_scan_home_away_time() - get Roam scan home away time
- * @mac_handle: The handle returned by mac_open
- * @vdev_id: vdev identifier
- * @roam_scan_home_away_time: Buffer to fill the roam scan home away time.
- *			      Valid only if the return status is success.
- *
- * Return: QDF_STATUS
- */
-QDF_STATUS sme_get_roam_scan_home_away_time(mac_handle_t mac_handle,
-					    uint8_t vdev_id,
-					    uint16_t *roam_scan_home_away_time);
 QDF_STATUS sme_update_wes_mode(mac_handle_t mac_handle, bool isWESModeEnabled,
 		uint8_t sessionId);
 
@@ -1046,7 +1034,6 @@ QDF_STATUS sme_set_roam_opportunistic_scan_threshold_diff(
 		mac_handle_t mac_handle,
 		uint8_t sessionId,
 		const uint8_t nOpportunisticThresholdDiff);
-uint8_t sme_get_roam_opportunistic_scan_threshold_diff(mac_handle_t mac_handle);
 
 /**
  * sme_set_neighbor_lookup_rssi_threshold() - update neighbor lookup rssi thr

core/sme/src/common/sme_api.c

@@ -6084,19 +6084,6 @@ QDF_STATUS sme_get_roam_scan_n_probes(mac_handle_t mac_handle, uint8_t vdev_id,
 	return QDF_STATUS_SUCCESS;
 }
 
-QDF_STATUS sme_get_roam_scan_home_away_time(mac_handle_t mac_handle,
-					    uint8_t vdev_id,
-					    uint16_t *roam_scan_home_away_time)
-{
-	struct mac_context *mac = MAC_CONTEXT(mac_handle);
-	struct cm_roam_values_copy temp;
-
-	wlan_cm_roam_cfg_get_value(mac->psoc, vdev_id, SCAN_HOME_AWAY, &temp);
-	*roam_scan_home_away_time = temp.uint_value;
-
-	return QDF_STATUS_SUCCESS;
-}
-
 QDF_STATUS sme_update_roam_rssi_diff(mac_handle_t mac_handle, uint8_t vdev_id,
 				     uint8_t roam_rssi_diff)
 {
@@ -6470,21 +6457,6 @@ QDF_STATUS sme_set_roam_opportunistic_scan_threshold_diff(
 	return status;
 }
 
-/*
- * sme_get_roam_opportunistic_scan_threshold_diff()
- * gets Opportunistic Scan threshold diff
- * This is a synchronous call
- *
- * mac_handle - The handle returned by mac_open
- * Return uint8_t - nOpportunisticThresholdDiff
- */
-uint8_t sme_get_roam_opportunistic_scan_threshold_diff(mac_handle_t mac_handle)
-{
-	struct mac_context *mac = MAC_CONTEXT(mac_handle);
-
-	return mac->mlme_cfg->lfr.opportunistic_scan_threshold_diff;
-}
-
 /*
  * sme_set_roam_rescan_rssi_diff() - Update roam rescan rssi diff
  * This function is called through dynamic setConfig callback function