qcacmn: Remove redundant DFS APIs

Remove the redundant DFS APIs dfs_mlme_get_dfs_channels_for_freq and
dfs_nol_timeout.

Change-Id: I9c93c27c3d575228a2e8102660b395beb040dcce

umac/dfs/core/src/misc/dfs.c

@@ -265,7 +265,6 @@ void dfs_timer_detach(struct wlan_dfs *dfs)
 	}
 
 	dfs_task_testtimer_detach(dfs);
-	dfs_nol_timer_detach(dfs);
 }
 
 void dfs_detach(struct wlan_dfs *dfs)
@@ -822,7 +821,6 @@ int dfs_reinit_timers(struct wlan_dfs *dfs)
 {
 	dfs_cac_timer_attach(dfs);
 	dfs_zero_cac_timer_init(dfs->dfs_soc_obj);
-	dfs_nol_timer_init(dfs);
 	dfs_main_task_testtimer_init(dfs);
 	return 0;
 }

umac/dfs/core/src/misc/dfs_nol.c

@@ -51,69 +51,6 @@ bool dfs_get_update_nol_flag(struct wlan_dfs *dfs)
 	return dfs->update_nol;
 }
 
-/**
- * dfs_nol_timeout() - NOL timeout function.
- *
- * Clears the WLAN_CHAN_DFS_RADAR_FOUND flag for the NOL timeout channel.
- */
-/* Unused function */
-#ifdef CONFIG_CHAN_FREQ_API
-static os_timer_func(dfs_nol_timeout)
-{
-	struct dfs_channel *c = NULL, lc;
-	unsigned long oldest, now;
-	struct wlan_dfs *dfs = NULL;
-	int i;
-	int nchans = 0;
-
-	c = &lc;
-
-	OS_GET_TIMER_ARG(dfs, struct wlan_dfs *);
-	dfs_mlme_get_dfs_ch_nchans(dfs->dfs_pdev_obj, &nchans);
-
-	now = oldest = qdf_system_ticks();
-	for (i = 0; i < nchans; i++) {
-		dfs_mlme_get_dfs_channels_for_freq
-			(dfs->dfs_pdev_obj,
-			 &c->dfs_ch_freq,
-			 &c->dfs_ch_flags,
-			 &c->dfs_ch_flagext,
-			 &c->dfs_ch_ieee,
-			 &c->dfs_ch_vhtop_ch_freq_seg1,
-			 &c->dfs_ch_vhtop_ch_freq_seg2,
-			 &c->dfs_ch_mhz_freq_seg1,
-			 &c->dfs_ch_mhz_freq_seg2,
-			 i);
-		if (WLAN_IS_CHAN_RADAR(dfs, c)) {
-			if (qdf_system_time_after_eq(now,
-						     dfs->dfs_nol_event[i] +
-						     dfs_get_nol_timeout(dfs))) {
-				c->dfs_ch_flagext &= ~WLAN_CHAN_DFS_RADAR_FOUND;
-				if (c->dfs_ch_flags & WLAN_CHAN_DFS_RADAR) {
-					/*
-					 * NB: do this here so we get only one
-					 * msg instead of one for every channel
-					 * table entry.
-					 */
-					dfs_debug(dfs, WLAN_DEBUG_DFS,
-						  "radar on channel %u (%u MHz) cleared after timeout",
-						  c->dfs_ch_ieee,
-						  c->dfs_ch_freq);
-				}
-			} else if (dfs->dfs_nol_event[i] < oldest) {
-				oldest = dfs->dfs_nol_event[i];
-			}
-		}
-	}
-	if (oldest != now) {
-		/* Arrange to process next channel up for a status change. */
-		qdf_timer_mod(&dfs->dfs_nol_timer,
-			      dfs_get_nol_timeout(dfs) -
-			      qdf_system_ticks_to_msecs(qdf_system_ticks()));
-	}
-}
-#endif
-
 /**
  * dfs_nol_elem_free_work_cb -  Free NOL element
  *
@@ -142,19 +79,9 @@ static void dfs_nol_elem_free_work_cb(void *context)
 	}
 }
 
-void dfs_nol_timer_init(struct wlan_dfs *dfs)
-{
-	qdf_timer_init(NULL,
-			&(dfs->dfs_nol_timer),
-			dfs_nol_timeout,
-			(void *)(dfs),
-			QDF_TIMER_TYPE_WAKE_APPS);
-}
-
 void dfs_nol_attach(struct wlan_dfs *dfs)
 {
 	dfs->wlan_dfs_nol_timeout = DFS_NOL_TIMEOUT_S;
-	dfs_nol_timer_init(dfs);
 	qdf_create_work(NULL, &dfs->dfs_nol_elem_free_work,
 			dfs_nol_elem_free_work_cb, dfs);
 	TAILQ_INIT(&dfs->dfs_nol_free_list);
@@ -170,11 +97,6 @@ void dfs_nol_detach(struct wlan_dfs *dfs)
 	WLAN_DFSNOL_LOCK_DESTROY(dfs);
 }
 
-void dfs_nol_timer_detach(struct wlan_dfs *dfs)
-{
-	qdf_timer_free(&dfs->dfs_nol_timer);
-}
-
 /**
  * dfs_nol_delete() - Delete the given frequency/chwidth from the NOL.
  * @dfs: Pointer to wlan_dfs structure.

umac/dfs/dispatcher/inc/wlan_dfs_mlme_api.h

@@ -94,13 +94,6 @@ void dfs_mlme_proc_cac(struct wlan_objmgr_pdev *pdev, uint32_t vdev_id);
  */
 void dfs_mlme_deliver_event_up_after_cac(struct wlan_objmgr_pdev *pdev);
 
-/**
- * dfs_mlme_get_dfs_ch_nchans() - Get number of channels in the channel list
- * @pdev: Pointer to DFS pdev object.
- * @nchans: Pointer to save the channel number.
- */
-void dfs_mlme_get_dfs_ch_nchans(struct wlan_objmgr_pdev *pdev, int *nchans);
-
 /**
  * dfs_mlme_get_extchan() - Get extension channel.
  * @pdev: Pointer to DFS pdev object.

umac/dfs/dispatcher/inc/wlan_dfs_ucfg_api.h

@@ -39,8 +39,6 @@
  * @mlme_proc_cac:                     Process the CAC completion event.
  * @mlme_deliver_event_up_after_cac:   Send a CAC timeout, VAP up event to user
  *                                     space
- * @mlme_get_dfs_ch_nchans:            Get number of channels in the channel
- *                                     list.
  * @mlme_set_no_chans_available:       Sets no_chans_available flag.
  * @mlme_ieee2mhz:                     Gets Channel freq from ieee number.
  * @mlme_find_dot11_channel:           Find dot11 channel.
@@ -102,8 +100,6 @@ struct dfs_to_mlme {
 	QDF_STATUS (*mlme_proc_cac)(struct wlan_objmgr_pdev *pdev);
 	QDF_STATUS (*mlme_deliver_event_up_after_cac)(
 			struct wlan_objmgr_pdev *pdev);
-	QDF_STATUS (*mlme_get_dfs_ch_nchans)(struct wlan_objmgr_pdev *pdev,
-			int *nchans);
 #ifdef CONFIG_CHAN_FREQ_API
 	QDF_STATUS (*mlme_get_extchan_for_freq)(struct wlan_objmgr_pdev *pdev,
 						uint16_t *dfs_ch_freq,

umac/dfs/dispatcher/src/wlan_dfs_init_deinit_api.c

@@ -111,8 +111,6 @@ register_dfs_callbacks_for_freq(struct dfs_to_mlme *mlme_callback)
 
 	mlme_callback->mlme_find_dot11_chan_for_freq =
 		mlme_dfs_find_dot11_chan_for_freq;
-	mlme_callback->mlme_get_dfs_channels_for_freq =
-		mlme_dfs_get_dfs_channels_for_freq;
 	mlme_callback->mlme_get_cac_timeout_for_freq =
 		mlme_dfs_get_cac_timeout_for_freq;
 	mlme_callback->mlme_get_extchan_for_freq =
@@ -136,7 +134,6 @@ void register_dfs_callbacks(void)
 	tmp_dfs_to_mlme->mlme_proc_cac = mlme_dfs_proc_cac;
 	tmp_dfs_to_mlme->mlme_deliver_event_up_after_cac =
 		mlme_dfs_deliver_event_up_after_cac;
-	tmp_dfs_to_mlme->mlme_get_dfs_ch_nchans = mlme_dfs_get_dfs_ch_nchans;
 	tmp_dfs_to_mlme->mlme_set_no_chans_available =
 		mlme_dfs_set_no_chans_available;
 	tmp_dfs_to_mlme->mlme_ieee2mhz = mlme_dfs_ieee2mhz;

umac/dfs/dispatcher/src/wlan_dfs_mlme_api.c

@@ -165,14 +165,6 @@ void dfs_mlme_deliver_event_up_after_cac(struct wlan_objmgr_pdev *pdev)
 				pdev);
 }
 
-void dfs_mlme_get_dfs_ch_nchans(struct wlan_objmgr_pdev *pdev,
-		int *nchans)
-{
-	if (global_dfs_to_mlme.mlme_get_dfs_ch_nchans)
-		global_dfs_to_mlme.mlme_get_dfs_ch_nchans(pdev,
-				nchans);
-}
-
 #ifdef CONFIG_CHAN_FREQ_API
 QDF_STATUS dfs_mlme_get_extchan_for_freq(struct wlan_objmgr_pdev *pdev,
 					 uint16_t *dfs_chan_freq,
@@ -303,32 +295,6 @@ void dfs_mlme_get_dfs_ch_channels(struct wlan_objmgr_pdev *pdev,
 }
 #endif
 
-#ifdef CONFIG_CHAN_FREQ_API
-void dfs_mlme_get_dfs_channels_for_freq(struct wlan_objmgr_pdev *pdev,
-					uint16_t *dfs_chan_freq,
-					uint64_t *dfs_chan_flags,
-					uint16_t *dfs_chan_flagext,
-					uint8_t *dfs_chan_ieee,
-					uint8_t *dfs_chan_vhtop_freq_seg1,
-					uint8_t *dfs_chan_vhtop_freq_seg2,
-					uint16_t *dfs_ch_mhz_freq_seg1,
-					uint16_t *dfs_ch_mhz_freq_seg2,
-					int index)
-{
-	if (global_dfs_to_mlme.mlme_get_dfs_channels_for_freq)
-		global_dfs_to_mlme.mlme_get_dfs_channels_for_freq(pdev,
-				dfs_chan_freq,
-				dfs_chan_flags,
-				dfs_chan_flagext,
-				dfs_chan_ieee,
-				dfs_chan_vhtop_freq_seg1,
-				dfs_chan_vhtop_freq_seg2,
-				dfs_ch_mhz_freq_seg1,
-				dfs_ch_mhz_freq_seg2,
-				index);
-}
-#endif
-
 uint32_t dfs_mlme_dfs_ch_flags_ext(struct wlan_objmgr_pdev *pdev)
 {
 	uint16_t flag_ext = 0;