Browse Source

qcacmn: Remove all WLAN_REG_CHAN_TO_BAND instances

Use wlan_reg_freq_to_band API to get band instead of
the deprecated WLAN_REG_CHAN_TO_BAND API as part of
regulatory cleanup effort.

Change-Id: I782c2e270e695fdfe1b88d05928cf063dadc859d
CRs-Fixed: 2898232
Tushnim Bhattacharyya 4 years ago
parent
commit
ca2545b8a1

+ 0 - 8
umac/regulatory/core/src/reg_services_common.c

@@ -1855,14 +1855,6 @@ bool reg_chan_is_49ghz(struct wlan_objmgr_pdev *pdev, uint8_t chan_num)
 	return REG_IS_49GHZ_FREQ(freq) ? true : false;
 	return REG_IS_49GHZ_FREQ(freq) ? true : false;
 }
 }
 
 
-enum band_info reg_chan_to_band(uint8_t chan_num)
-{
-	if (chan_num <= 14)
-		return BAND_2G;
-
-	return BAND_5G;
-}
-
 void reg_update_nol_ch(struct wlan_objmgr_pdev *pdev,
 void reg_update_nol_ch(struct wlan_objmgr_pdev *pdev,
 		       uint8_t *chan_list,
 		       uint8_t *chan_list,
 		       uint8_t num_chan,
 		       uint8_t num_chan,

+ 0 - 10
umac/regulatory/core/src/reg_services_common.h

@@ -307,16 +307,6 @@ uint16_t reg_get_bw_value(enum phy_ch_width bw);
 void reg_set_dfs_region(struct wlan_objmgr_pdev *pdev,
 void reg_set_dfs_region(struct wlan_objmgr_pdev *pdev,
 			enum dfs_reg dfs_reg);
 			enum dfs_reg dfs_reg);
 
 
-#ifdef CONFIG_CHAN_NUM_API
-/**
- * reg_chan_to_band() - Get band from channel number
- * @chan_num: channel number
- *
- * Return: band info
- */
-enum band_info reg_chan_to_band(uint8_t chan_num);
-#endif /* CONFIG_CHAN_NUM_API */
-
 /**
 /**
  * reg_program_chan_list() - Set user country code and populate the channel list
  * reg_program_chan_list() - Set user country code and populate the channel list
  * @pdev: Pointer to pdev
  * @pdev: Pointer to pdev

+ 0 - 11
umac/regulatory/dispatcher/inc/wlan_reg_services_api.h

@@ -407,17 +407,6 @@ bool wlan_reg_is_channel_valid_5g_sbs(uint8_t curchan, uint8_t newchan);
 #endif /* CONFIG_CHAN_NUM_API */
 #endif /* CONFIG_CHAN_NUM_API */
 
 
 
 
-#ifdef CONFIG_CHAN_NUM_API
-/**
- * wlan_reg_chan_to_band() - Get band from channel number
- * @chan_num: channel number
- *
- * Return: band info
- */
-#define WLAN_REG_CHAN_TO_BAND(chan_num)  wlan_reg_chan_to_band(chan_num)
-enum band_info wlan_reg_chan_to_band(uint8_t chan_num);
-#endif /* CONFIG_CHAN_NUM_API */
-
 /**
 /**
  * wlan_reg_read_default_country() - Read the default country for the regdomain
  * wlan_reg_read_default_country() - Read the default country for the regdomain
  * @country: pointer to the country code.
  * @country: pointer to the country code.

+ 0 - 7
umac/regulatory/dispatcher/src/wlan_reg_services_api.c

@@ -852,13 +852,6 @@ bool wlan_reg_is_channel_valid_5g_sbs(uint8_t curchan, uint8_t newchan)
 {
 {
 	return reg_is_channel_valid_5g_sbs(curchan, newchan);
 	return reg_is_channel_valid_5g_sbs(curchan, newchan);
 }
 }
-
-enum band_info wlan_reg_chan_to_band(uint8_t chan_num)
-{
-	return reg_chan_to_band(chan_num);
-}
-
-qdf_export_symbol(wlan_reg_chan_to_band);
 #endif /* CONFIG_CHAN_NUM_API */
 #endif /* CONFIG_CHAN_NUM_API */
 
 
 bool wlan_reg_is_regdmn_en302502_applicable(struct wlan_objmgr_pdev *pdev)
 bool wlan_reg_is_regdmn_en302502_applicable(struct wlan_objmgr_pdev *pdev)