Browse Source

qcacmn: Rename "dfs_cac_attach" to "dfs_cac_timer_attach"

Rename dfs_cac_attach to dfs_cac_timer_attach. This is to align with
other function names.

CRs-Fixed: 2519566
Change-Id: I9c66fa1688c1790bd72f6e7938e612e57035c876
Priyadarshnee S 5 years ago
parent
commit
46f2727365
3 changed files with 7 additions and 18 deletions
  1. 2 8
      umac/dfs/core/src/dfs.h
  2. 2 2
      umac/dfs/core/src/misc/dfs.c
  3. 3 8
      umac/dfs/core/src/misc/dfs_cac.c

+ 2 - 8
umac/dfs/core/src/dfs.h

@@ -2166,16 +2166,10 @@ int dfs_get_debug_info(struct wlan_dfs *dfs,
 		void *data);
 
 /**
- * dfs_cac_timer_init() - Initialize cac timers.
+ * dfs_cac_timer_attach() - Initialize cac timers.
  * @dfs: Pointer to wlan_dfs structure.
  */
-void dfs_cac_timer_init(struct wlan_dfs *dfs);
-
-/**
- * dfs_cac_attach() - Initialize dfs cac variables.
- * @dfs: Pointer to wlan_dfs structure.
- */
-void dfs_cac_attach(struct wlan_dfs *dfs);
+void dfs_cac_timer_attach(struct wlan_dfs *dfs);
 
 /**
  * dfs_cac_timer_reset() - Cancel dfs cac timers.

+ 2 - 2
umac/dfs/core/src/misc/dfs.c

@@ -185,7 +185,7 @@ int dfs_attach(struct wlan_dfs *dfs)
 			return ret;
 		}
 	}
-	dfs_cac_attach(dfs);
+	dfs_cac_timer_attach(dfs);
 	dfs_zero_cac_attach(dfs);
 	dfs_etsi_precac_attach(dfs);
 	dfs_nol_attach(dfs);
@@ -758,7 +758,7 @@ void dfs_update_cur_chan_flags(struct wlan_dfs *dfs,
 
 int dfs_reinit_timers(struct wlan_dfs *dfs)
 {
-	dfs_cac_attach(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);

+ 3 - 8
umac/dfs/core/src/misc/dfs_cac.c

@@ -168,8 +168,10 @@ static os_timer_func(dfs_cac_timeout)
 	}
 }
 
-void dfs_cac_timer_init(struct wlan_dfs *dfs)
+void dfs_cac_timer_attach(struct wlan_dfs *dfs)
 {
+	dfs->dfs_cac_timeout_override = -1;
+	dfs->wlan_dfs_cac_time = WLAN_DFS_WAIT_MS;
 	qdf_timer_init(NULL,
 			&(dfs->dfs_cac_timer),
 			dfs_cac_timeout,
@@ -183,13 +185,6 @@ void dfs_cac_timer_init(struct wlan_dfs *dfs)
 			QDF_TIMER_TYPE_WAKE_APPS);
 }
 
-void dfs_cac_attach(struct wlan_dfs *dfs)
-{
-	dfs->dfs_cac_timeout_override = -1;
-	dfs->wlan_dfs_cac_time = WLAN_DFS_WAIT_MS;
-	dfs_cac_timer_init(dfs);
-}
-
 void dfs_cac_timer_reset(struct wlan_dfs *dfs)
 {
 	qdf_timer_stop(&dfs->dfs_cac_timer);