diff --git a/umac/dfs/core/src/dfs_random_chan_sel.h b/umac/dfs/core/src/dfs_random_chan_sel.h
index b7dc5f9005bb..99f6a3c7cc32 100644
--- a/umac/dfs/core/src/dfs_random_chan_sel.h
+++ b/umac/dfs/core/src/dfs_random_chan_sel.h
@@ -177,7 +177,7 @@ struct chan_bonding_bitmap {
  *
  * Return: channel number, else zero.
  */
-int dfs_prepare_random_channel(struct wlan_dfs *dfs,
+uint8_t dfs_prepare_random_channel(struct wlan_dfs *dfs,
 	struct dfs_ieee80211_channel *ch_list,
 	uint32_t ch_count,
 	uint32_t flags,
diff --git a/umac/dfs/core/src/misc/dfs_nol.c b/umac/dfs/core/src/misc/dfs_nol.c
index 9e8db1e6bd86..fa20bdc0e291 100644
--- a/umac/dfs/core/src/misc/dfs_nol.c
+++ b/umac/dfs/core/src/misc/dfs_nol.c
@@ -194,7 +194,7 @@ static os_timer_func(dfs_remove_from_nol)
 		    "remove channel %d from nol", chan);
 	utils_dfs_reg_update_nol_ch(dfs->dfs_pdev_obj,
 			(uint8_t *)&chan, 1, DFS_NOL_RESET);
-	dfs_save_nol(dfs->dfs_pdev_obj);
+	utils_dfs_save_nol(dfs->dfs_pdev_obj);
 }
 
 void dfs_print_nol(struct wlan_dfs *dfs)
diff --git a/umac/dfs/core/src/misc/dfs_process_radar_found_ind.c b/umac/dfs/core/src/misc/dfs_process_radar_found_ind.c
index b18bb277813f..488cb186d6b0 100644
--- a/umac/dfs/core/src/misc/dfs_process_radar_found_ind.c
+++ b/umac/dfs/core/src/misc/dfs_process_radar_found_ind.c
@@ -108,7 +108,7 @@ static void dfs_radar_add_to_nol(struct wlan_dfs *dfs,
 	}
 	utils_dfs_reg_update_nol_ch(dfs->dfs_pdev_obj,
 			nollist, num_ch, DFS_NOL_SET);
-	dfs_save_nol(dfs->dfs_pdev_obj);
+	utils_dfs_save_nol(dfs->dfs_pdev_obj);
 }
 
 /**
diff --git a/umac/dfs/core/src/misc/dfs_random_chan_sel.c b/umac/dfs/core/src/misc/dfs_random_chan_sel.c
index f27570c2785a..a6e3f4442034 100644
--- a/umac/dfs/core/src/misc/dfs_random_chan_sel.c
+++ b/umac/dfs/core/src/misc/dfs_random_chan_sel.c
@@ -530,7 +530,7 @@ static void dfs_apply_rules(struct wlan_dfs *dfs,
 	}
 }
 
-int dfs_prepare_random_channel(struct wlan_dfs *dfs,
+uint8_t dfs_prepare_random_channel(struct wlan_dfs *dfs,
 	struct dfs_ieee80211_channel *ch_list,
 	uint32_t ch_cnt,
 	uint32_t flags,
diff --git a/umac/dfs/dispatcher/inc/wlan_dfs_utils_api.h b/umac/dfs/dispatcher/inc/wlan_dfs_utils_api.h
index b156463fd72c..c2a9b16da2a3 100644
--- a/umac/dfs/dispatcher/inc/wlan_dfs_utils_api.h
+++ b/umac/dfs/dispatcher/inc/wlan_dfs_utils_api.h
@@ -328,7 +328,7 @@ QDF_STATUS utils_dfs_get_nol_chfreq_and_chwidth(struct wlan_objmgr_pdev *pdev,
 		int index);
 
 /**
- * dfs_get_random_channel() - Get random channel.
+ * utils_dfs_get_random_channel() - Get random channel.
  * @pdev: Pointer to DFS pdev object.
  * @flags: random channel selection flags.
  * @ch_params: current channel params.
@@ -341,50 +341,50 @@ QDF_STATUS utils_dfs_get_nol_chfreq_and_chwidth(struct wlan_objmgr_pdev *pdev,
  *
  * Return: QDF_STATUS
  */
-QDF_STATUS dfs_get_random_channel(struct wlan_objmgr_pdev *pdev,
+QDF_STATUS utils_dfs_get_random_channel(struct wlan_objmgr_pdev *pdev,
 		uint16_t flags, struct ch_params *ch_params,
-		uint32_t *hw_mode, int *target_chan,
+		uint32_t *hw_mode, uint8_t *target_chan,
 		struct dfs_acs_info *acs_info);
 
 /**
- * dfs_init_nol() - Initialize nol from platform driver.
+ * utils_dfs_init_nol() - Initialize nol from platform driver.
  * @pdev: pdev handler.
  *
  * Initialize nol from platform driver.
  *
  * Return: None
  */
-void dfs_init_nol(struct wlan_objmgr_pdev *pdev);
+void utils_dfs_init_nol(struct wlan_objmgr_pdev *pdev);
 
 /**
- * dfs_save_nol() - save nol list to platform driver.
+ * utils_dfs_save_nol() - save nol list to platform driver.
  * @pdev: pdev handler.
  *
  * Save nol list to platform driver.
  *
  * Return: None
  */
-void dfs_save_nol(struct wlan_objmgr_pdev *pdev);
+void utils_dfs_save_nol(struct wlan_objmgr_pdev *pdev);
 
 /**
- * dfs_print_nol_channels() - log nol channels.
+ * utils_dfs_print_nol_channels() - log nol channels.
  * @pdev: pdev handler.
  *
  * log nol channels.
  *
  * Return: None
  */
-void dfs_print_nol_channels(struct wlan_objmgr_pdev *pdev);
+void utils_dfs_print_nol_channels(struct wlan_objmgr_pdev *pdev);
 
 /**
- * dfs_clear_nol_channels() - clear nol list.
+ * utils_dfs_clear_nol_channels() - clear nol list.
  * @pdev: pdev handler.
  *
  * log nol channels.
  *
  * Return: None
  */
-void dfs_clear_nol_channels(struct wlan_objmgr_pdev *pdev);
+void utils_dfs_clear_nol_channels(struct wlan_objmgr_pdev *pdev);
 
 /**
  * utils_is_dfs_ch() - is channel dfs.
diff --git a/umac/dfs/dispatcher/src/wlan_dfs_init_deinit_api.c b/umac/dfs/dispatcher/src/wlan_dfs_init_deinit_api.c
index 677ea492174f..568bdb5caf2b 100644
--- a/umac/dfs/dispatcher/src/wlan_dfs_init_deinit_api.c
+++ b/umac/dfs/dispatcher/src/wlan_dfs_init_deinit_api.c
@@ -181,7 +181,7 @@ QDF_STATUS wlan_dfs_pdev_obj_create_notification(struct wlan_objmgr_pdev *pdev,
 		dfs_destroy_object(dfs);
 		return QDF_STATUS_E_FAILURE;
 	}
-	dfs_init_nol(pdev);
+	utils_dfs_init_nol(pdev);
 	dfs_print_nol(dfs);
 
 	return QDF_STATUS_SUCCESS;
diff --git a/umac/dfs/dispatcher/src/wlan_dfs_utils_api.c b/umac/dfs/dispatcher/src/wlan_dfs_utils_api.c
index 53dc362ab7c2..28528f8771a4 100644
--- a/umac/dfs/dispatcher/src/wlan_dfs_utils_api.c
+++ b/umac/dfs/dispatcher/src/wlan_dfs_utils_api.c
@@ -509,12 +509,12 @@ static void utils_dfs_get_chan_list(struct wlan_objmgr_pdev *pdev,
 }
 #endif
 
-QDF_STATUS dfs_get_random_channel(
+QDF_STATUS utils_dfs_get_random_channel(
 	struct wlan_objmgr_pdev *pdev,
 	uint16_t flags,
 	struct ch_params *ch_params,
 	uint32_t *hw_mode,
-	int *target_chan,
+	uint8_t *target_chan,
 	struct dfs_acs_info *acs_info)
 {
 	uint32_t dfs_reg;
@@ -569,7 +569,7 @@ QDF_STATUS dfs_get_random_channel(
 
 	if (*target_chan) {
 		wlan_reg_set_channel_params(pdev,
-			(uint8_t)*target_chan, 0, ch_params);
+				*target_chan, 0, ch_params);
 		utils_dfs_get_max_phy_mode(pdev, hw_mode);
 		status = QDF_STATUS_SUCCESS;
 	}
@@ -584,14 +584,14 @@ random_chan_error:
 
 	return status;
 }
-EXPORT_SYMBOL(dfs_get_random_channel);
+EXPORT_SYMBOL(utils_dfs_get_random_channel);
 
 #ifndef QCA_DFS_NOL_PLATFORM_DRV_SUPPORT
-void dfs_init_nol(struct wlan_objmgr_pdev *pdev)
+void utils_dfs_init_nol(struct wlan_objmgr_pdev *pdev)
 {
 }
 #else
-void dfs_init_nol(struct wlan_objmgr_pdev *pdev)
+void utils_dfs_init_nol(struct wlan_objmgr_pdev *pdev)
 {
 	struct wlan_dfs *dfs;
 	struct wlan_objmgr_psoc *psoc;
@@ -625,14 +625,14 @@ void dfs_init_nol(struct wlan_objmgr_pdev *pdev)
 	}
 }
 #endif
-EXPORT_SYMBOL(dfs_init_nol);
+EXPORT_SYMBOL(utils_dfs_init_nol);
 
 #ifndef QCA_DFS_NOL_PLATFORM_DRV_SUPPORT
-void dfs_save_nol(struct wlan_objmgr_pdev *pdev)
+void utils_dfs_save_nol(struct wlan_objmgr_pdev *pdev)
 {
 }
 #else
-void dfs_save_nol(struct wlan_objmgr_pdev *pdev)
+void utils_dfs_save_nol(struct wlan_objmgr_pdev *pdev)
 {
 	struct dfs_nol_info dfs_nolinfo;
 	struct wlan_dfs *dfs = NULL;
@@ -672,9 +672,9 @@ void dfs_save_nol(struct wlan_objmgr_pdev *pdev)
 	}
 }
 #endif
-EXPORT_SYMBOL(dfs_save_nol);
+EXPORT_SYMBOL(utils_dfs_save_nol);
 
-void dfs_print_nol_channels(struct wlan_objmgr_pdev *pdev)
+void utils_dfs_print_nol_channels(struct wlan_objmgr_pdev *pdev)
 {
 	struct wlan_dfs *dfs = NULL;
 
@@ -686,9 +686,9 @@ void dfs_print_nol_channels(struct wlan_objmgr_pdev *pdev)
 
 	dfs_print_nol(dfs);
 }
-EXPORT_SYMBOL(dfs_print_nol_channels);
+EXPORT_SYMBOL(utils_dfs_print_nol_channels);
 
-void dfs_clear_nol_channels(struct wlan_objmgr_pdev *pdev)
+void utils_dfs_clear_nol_channels(struct wlan_objmgr_pdev *pdev)
 {
 	struct wlan_dfs *dfs = NULL;
 
@@ -709,9 +709,9 @@ void dfs_clear_nol_channels(struct wlan_objmgr_pdev *pdev)
 	 * update platform driver nol list with local cache which is zero,
 	 * cleared in above step, so this will clear list in platform driver.
 	 */
-	dfs_save_nol(pdev);
+	utils_dfs_save_nol(pdev);
 }
-EXPORT_SYMBOL(dfs_clear_nol_channels);
+EXPORT_SYMBOL(utils_dfs_clear_nol_channels);
 
 bool utils_is_dfs_ch(struct wlan_objmgr_pdev *pdev, uint32_t chan)
 {