From 5743559888abd376135c1d8776c39d2a5b9a7b3a Mon Sep 17 00:00:00 2001 From: sheenam monga Date: Wed, 27 Jan 2021 15:51:30 +0530 Subject: [PATCH] qcacmn: Remove utils_dfs_bw_reduced_channel Remove utils_dfs_bw_reduced_channel as this function is not used by MCL or WIN. Change-Id: I042578fea76cd845b90f240fa3e814e50f2eaf5b CRs-Fixed: 2859799 --- umac/dfs/dispatcher/inc/wlan_dfs_utils_api.h | 21 +------- umac/dfs/dispatcher/src/wlan_dfs_utils_api.c | 52 +------------------- 2 files changed, 2 insertions(+), 71 deletions(-) diff --git a/umac/dfs/dispatcher/inc/wlan_dfs_utils_api.h b/umac/dfs/dispatcher/inc/wlan_dfs_utils_api.h index 205fcf2322..b56f7b7080 100644 --- a/umac/dfs/dispatcher/inc/wlan_dfs_utils_api.h +++ b/umac/dfs/dispatcher/inc/wlan_dfs_utils_api.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 The Linux Foundation. All rights reserved. + * Copyright (c) 2016-2021 The Linux Foundation. All rights reserved. * * * Permission to use, copy, modify, and/or distribute this software for @@ -539,25 +539,6 @@ QDF_STATUS utils_dfs_get_vdev_random_channel_for_freq( uint16_t *target_chan_freq, struct dfs_acs_info *acs_info); #endif -/** - * utils_dfs_bw_reduced_channel() - Get BW reduced channel. - * @pdev: Pointer to DFS pdev object. - * @ch_params: current channel params. - * @hw_mode: current operating mode. - * @target_chan: Pointer to target_chan. - * - * wrapper function for get bw_reduced_channel. this - * function called from outside of dfs component. - * - * Return: QDF_STATUS - */ -#ifdef CONFIG_CHAN_NUM_API -QDF_STATUS utils_dfs_bw_reduced_channel(struct wlan_objmgr_pdev *pdev, - struct ch_params *ch_params, - uint32_t *hw_mode, - uint8_t *target_chan); -#endif - /** * utils_dfs_bw_reduced_channel_for_freq() - Get BW reduced channel. * @pdev: Pointer to DFS pdev object. diff --git a/umac/dfs/dispatcher/src/wlan_dfs_utils_api.c b/umac/dfs/dispatcher/src/wlan_dfs_utils_api.c index 904cd52427..5d86d787d2 100644 --- a/umac/dfs/dispatcher/src/wlan_dfs_utils_api.c +++ b/umac/dfs/dispatcher/src/wlan_dfs_utils_api.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 The Linux Foundation. All rights reserved. + * Copyright (c) 2016-2021 The Linux Foundation. All rights reserved. * * * Permission to use, copy, modify, and/or distribute this software for @@ -1109,56 +1109,6 @@ QDF_STATUS utils_dfs_get_random_channel_for_freq( qdf_export_symbol(utils_dfs_get_random_channel_for_freq); #endif -#ifdef CONFIG_CHAN_NUM_API -QDF_STATUS utils_dfs_bw_reduced_channel( - struct wlan_objmgr_pdev *pdev, - struct ch_params *ch_params, - uint32_t *hw_mode, - uint8_t *target_chan) -{ - struct wlan_dfs *dfs = NULL; - struct wlan_objmgr_psoc *psoc; - enum channel_state ch_state; - QDF_STATUS status = QDF_STATUS_E_FAILURE; - - *target_chan = 0; - psoc = wlan_pdev_get_psoc(pdev); - if (!psoc) { - dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "null psoc"); - return status; - } - - dfs = wlan_pdev_get_dfs_obj(pdev); - if (!dfs) { - dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "null dfs"); - return status; - } - - ch_state = wlan_reg_get_channel_state(pdev, - dfs->dfs_curchan->dfs_ch_ieee); - - if (ch_state == CHANNEL_STATE_DFS || - ch_state == CHANNEL_STATE_ENABLE) { - ch_params->center_freq_seg0 = - dfs->dfs_curchan->dfs_ch_vhtop_ch_freq_seg1; - ch_params->center_freq_seg1 = - dfs->dfs_curchan->dfs_ch_vhtop_ch_freq_seg2; - wlan_reg_set_channel_params(pdev, - dfs->dfs_curchan->dfs_ch_ieee, - 0, ch_params); - - *target_chan = dfs->dfs_curchan->dfs_ch_ieee; - utils_dfs_get_max_phy_mode(pdev, hw_mode); - - return QDF_STATUS_SUCCESS; - } - - return status; -} - -qdf_export_symbol(utils_dfs_bw_reduced_channel); -#endif - #ifdef CONFIG_CHAN_FREQ_API QDF_STATUS utils_dfs_bw_reduced_channel_for_freq( struct wlan_objmgr_pdev *pdev,