qcacmn: Remove WLAN_REG_IS_24GHZ_CH in wlan_reg_get_bonded_channel_state

Remove WLAN_REG_IS_24GHZ_CH in wlan_reg_get_bonded_channel_state.
Remove definition of following:
WLAN_REG_IS_24GHZ_CH
wlan_reg_is_24ghz_ch
WLAN_REG_IS_5GHZ_CH
wlan_reg_is_5ghz_ch

Change-Id: I7bea616f0bb8e0b98bfe03e9fd66ef24588f59e3
CRs-Fixed: 2883685

umac/regulatory/core/src/reg_services_common.c

@@ -2402,15 +2402,6 @@ void reg_update_nol_history_ch(struct wlan_objmgr_pdev *pdev,
 	}
 }
 
-bool reg_is_24ghz_ch(uint32_t chan)
-{
-	return REG_IS_24GHZ_CH(chan);
-}
-
-bool reg_is_5ghz_ch(uint32_t chan)
-{
-	return REG_IS_5GHZ_CH(chan);
-}
 #endif /* CONFIG_CHAN_NUM_API */
 
 bool reg_is_24ghz_ch_freq(uint32_t freq)

umac/regulatory/core/src/reg_services_common.h

@@ -513,21 +513,6 @@ void reg_update_nol_history_ch(struct wlan_objmgr_pdev *pdev,
 			       uint8_t num_chan,
 			       bool nol_history_chan);
 
-/**
- * reg_is_24ghz_ch() - Check if the given channel number is 2.4GHz
- * @chan: Channel number
- *
- * Return: true if channel number is 2.4GHz, else false
- */
-bool reg_is_24ghz_ch(uint32_t chan);
-
-/**
- * reg_is_5ghz_ch() - Check if the given channel number is 5GHz
- * @chan: Channel number
- *
- * Return: true if channel number is 5GHz, else false
- */
-bool reg_is_5ghz_ch(uint32_t chan);
 #endif /* CONFIG_CHAN_NUM_API */
 
 /**

umac/regulatory/dispatcher/inc/wlan_reg_services_api.h

@@ -96,26 +96,6 @@ qdf_freq_t wlan_reg_min_5ghz_chan_freq(void);
 qdf_freq_t wlan_reg_max_5ghz_chan_freq(void);
 #endif /* CONFIG_CHAN_FREQ_API */
 
-#ifdef CONFIG_CHAN_NUM_API
-/**
- * wlan_reg_is_24ghz_ch() - Check if the given channel number is 2.4GHz
- * @chan: Channel number
- *
- * Return: true if channel number is 2.4GHz, else false
- */
-#define WLAN_REG_IS_24GHZ_CH(chan) wlan_reg_is_24ghz_ch(chan)
-bool wlan_reg_is_24ghz_ch(uint8_t chan);
-
-/**
- * wlan_reg_is_5ghz_ch() - Check if the given channel number is 5GHz
- * @chan: Channel number
- *
- * Return: true if channel number is 5GHz, else false
- */
-#define WLAN_REG_IS_5GHZ_CH(chan) wlan_reg_is_5ghz_ch(chan)
-bool wlan_reg_is_5ghz_ch(uint8_t chan);
-#endif /* CONFIG_CHAN_NUM_API */
-
 /**
  * wlan_reg_is_24ghz_ch_freq() - Check if the given channel frequency is 2.4GHz
  * @freq: Channel frequency
@@ -649,21 +629,6 @@ qdf_freq_t wlan_reg_get_channel_freq(struct wlan_objmgr_pdev *pdev,
 QDF_STATUS wlan_reg_get_current_chan_list(struct wlan_objmgr_pdev *pdev,
 		struct regulatory_channel *chan_list);
 
-#ifdef CONFIG_CHAN_NUM_API
-/**
- * wlan_reg_get_bonded_channel_state() - get bonded channel state
- * @pdev: pdev ptr
- * @ch: chennal number
- * @bw: chennal number
- * @sec_ch: secondary channel
- *
- * Return: enum channel_state
- */
-enum channel_state wlan_reg_get_bonded_channel_state(
-	struct wlan_objmgr_pdev *pdev, uint8_t ch,
-	enum phy_ch_width bw, uint8_t sec_ch);
-#endif /* CONFIG_CHAN_NUM_API */
-
 /**
  * wlan_reg_get_bonded_channel_state_for_freq() - Get bonded channel freq state
  * @freq: channel frequency

umac/regulatory/dispatcher/src/wlan_reg_services_api.c

@@ -217,29 +217,6 @@ uint16_t wlan_reg_get_bw_value(enum phy_ch_width bw)
 
 qdf_export_symbol(wlan_reg_get_bw_value);
 
-#ifdef CONFIG_CHAN_NUM_API
-/**
- * wlan_reg_get_bonded_channel_state() - Get 2G bonded channel state
- * @ch: channel number.
- * @bw: channel band width
- *
- * Return: channel state
- */
-enum channel_state
-wlan_reg_get_bonded_channel_state(struct wlan_objmgr_pdev *pdev,
-				  uint8_t ch,
-				  enum phy_ch_width bw, uint8_t sec_ch)
-{
-	if (WLAN_REG_IS_24GHZ_CH(ch))
-		return reg_get_2g_bonded_channel_state(pdev, ch,
-						       sec_ch, bw);
-	else
-		return reg_get_5g_bonded_channel_state(pdev, ch,
-						       bw);
-}
-
-#endif /* CONFIG_CHAN_NUM_API */
-
 /**
  * wlan_reg_set_dfs_region () - Get the current dfs region
  * @dfs_reg: pointer to dfs region
@@ -790,18 +767,6 @@ qdf_freq_t wlan_reg_max_5ghz_chan_freq(void)
 }
 #endif /* CONFIG_CHAN_FREQ_API */
 
-#ifdef CONFIG_CHAN_NUM_API
-bool wlan_reg_is_24ghz_ch(uint8_t chan)
-{
-	return reg_is_24ghz_ch(chan);
-}
-
-bool wlan_reg_is_5ghz_ch(uint8_t chan)
-{
-	return reg_is_5ghz_ch(chan);
-}
-#endif /* CONFIG_CHAN_NUM_API */
-
 bool wlan_reg_is_24ghz_ch_freq(qdf_freq_t freq)
 {
 	return reg_is_24ghz_ch_freq(freq);