Browse Source

qcacmn: Removed unused DFS function

Remove unused mlme function to get dfs object and replace
it with the dfs equivalent.

Change-Id: I3ffadb77072fa119957469e0bf97fa4a80f99ac9
CRs-Fixed: 2368988
Visudha Sathurappan 6 years ago
parent
commit
bbd9d427a7

+ 0 - 2
umac/dfs/dispatcher/inc/wlan_dfs_ucfg_api.h

@@ -71,8 +71,6 @@ struct dfs_to_mlme {
 	QDF_STATUS (*pdev_component_obj_detach)(struct wlan_objmgr_pdev *pdev,
 			enum wlan_umac_comp_id id,
 			void *comp_priv_obj);
-	struct wlan_dfs *(*pdev_get_comp_private_obj)(
-			struct wlan_objmgr_pdev *pdev);
 	QDF_STATUS (*dfs_start_rcsa)(struct wlan_objmgr_pdev *pdev,
 			bool *wait_for_csa);
 	QDF_STATUS (*mlme_mark_dfs)(struct wlan_objmgr_pdev *pdev,

+ 0 - 4
umac/dfs/dispatcher/src/wlan_dfs_init_deinit_api.c

@@ -74,8 +74,6 @@ void register_dfs_callbacks(void)
 		wlan_objmgr_pdev_component_obj_attach;
 	tmp_dfs_to_mlme->pdev_component_obj_detach =
 		wlan_objmgr_pdev_component_obj_detach;
-	tmp_dfs_to_mlme->pdev_get_comp_private_obj =
-		wlan_pdev_get_dfs_obj;
 
 	tmp_dfs_to_mlme->dfs_start_rcsa = mlme_dfs_start_rcsa;
 	tmp_dfs_to_mlme->mlme_mark_dfs = mlme_dfs_mark_dfs;
@@ -125,8 +123,6 @@ void register_dfs_callbacks(void)
 		wlan_objmgr_pdev_component_obj_attach;
 	tmp_dfs_to_mlme->pdev_component_obj_detach =
 		wlan_objmgr_pdev_component_obj_detach;
-	tmp_dfs_to_mlme->pdev_get_comp_private_obj =
-		wlan_pdev_get_dfs_obj;
 }
 #endif
 

+ 7 - 7
umac/dfs/dispatcher/src/wlan_dfs_utils_api.c

@@ -236,7 +236,7 @@ bool utils_dfs_is_precac_done(struct wlan_objmgr_pdev *pdev,
 	struct wlan_dfs *dfs;
 	struct dfs_channel chan;
 
-	dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev);
+	dfs = wlan_pdev_get_dfs_obj(pdev);
 	if (!dfs)
 		return false;
 	utils_fill_dfs_chan_info(&chan, wlan_chan);
@@ -404,7 +404,7 @@ QDF_STATUS utils_dfs_bw_reduce(struct wlan_objmgr_pdev *pdev, bool bw_reduce)
 {
 	struct wlan_dfs *dfs;
 
-	dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev);
+	dfs = wlan_pdev_get_dfs_obj(pdev);
 	if (!dfs)
 		return  QDF_STATUS_E_FAILURE;
 
@@ -420,7 +420,7 @@ QDF_STATUS utils_dfs_is_bw_reduce(struct wlan_objmgr_pdev *pdev,
 {
 	struct wlan_dfs *dfs;
 
-	dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev);
+	dfs = wlan_pdev_get_dfs_obj(pdev);
 	if (!dfs)
 		return  QDF_STATUS_E_FAILURE;
 
@@ -436,7 +436,7 @@ QDF_STATUS utils_dfs_fetch_nol_ie_info(struct wlan_objmgr_pdev *pdev,
 {
 	struct wlan_dfs *dfs;
 
-	dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev);
+	dfs = wlan_pdev_get_dfs_obj(pdev);
 	if (!dfs)
 		return  QDF_STATUS_E_FAILURE;
 
@@ -452,7 +452,7 @@ QDF_STATUS utils_dfs_set_rcsa_flags(struct wlan_objmgr_pdev *pdev,
 {
 	struct wlan_dfs *dfs;
 
-	dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev);
+	dfs = wlan_pdev_get_dfs_obj(pdev);
 	if (!dfs)
 		return  QDF_STATUS_E_FAILURE;
 
@@ -467,7 +467,7 @@ QDF_STATUS utils_dfs_get_rcsa_flags(struct wlan_objmgr_pdev *pdev,
 {
 	struct wlan_dfs *dfs;
 
-	dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev);
+	dfs = wlan_pdev_get_dfs_obj(pdev);
 	if (!dfs)
 		return  QDF_STATUS_E_FAILURE;
 	dfs_get_rcsa_flags(dfs, is_rcsa_ie_sent, is_nol_ie_sent);
@@ -482,7 +482,7 @@ bool utils_dfs_process_nol_ie_bitmap(struct wlan_objmgr_pdev *pdev,
 {
 	struct wlan_dfs *dfs;
 
-	dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev);
+	dfs = wlan_pdev_get_dfs_obj(pdev);
 	if (!dfs)
 		return  false;
 	return dfs_process_nol_ie_bitmap(dfs, nol_ie_bandwidth,