Pārlūkot izejas kodu

qcacmn: Remove unused api reg_chan_to_freq

Usage of api reg_chan_to_freq is replaced
with wlan_reg_legacy_chan_to_freq. So remove
unused api reg_chan_to_freq.

Change-Id: Ic14d5204c68698ef4cfd5953cf511503b211d461
CRs-Fixed: 2853570
sheenam monga 4 gadi atpakaļ
vecāks
revīzija
3dbaf035c3

+ 1 - 37
umac/regulatory/core/src/reg_services_common.c

@@ -1806,48 +1806,12 @@ uint16_t reg_legacy_chan_to_freq(struct wlan_objmgr_pdev *pdev,
 					max_chan_range);
 }
 
-qdf_freq_t reg_chan_to_freq(struct wlan_objmgr_pdev *pdev,
-			    uint8_t chan_num)
-{
-	uint32_t count;
-	struct regulatory_channel *chan_list;
-	struct wlan_regulatory_pdev_priv_obj *pdev_priv_obj;
-
-	if (chan_num == 0) {
-		reg_err_rl("Invalid channel %d", chan_num);
-		return 0;
-	}
-
-	pdev_priv_obj = reg_get_pdev_obj(pdev);
-
-	if (!IS_VALID_PDEV_REG_OBJ(pdev_priv_obj)) {
-		reg_err("reg pdev priv obj is NULL");
-		return 0;
-	}
-
-	chan_list = pdev_priv_obj->cur_chan_list;
-	for (count = 0; count < NUM_CHANNELS; count++)
-		if (chan_list[count].chan_num == chan_num) {
-			if (reg_chan_in_range(chan_list,
-					      pdev_priv_obj->range_2g_low,
-					      pdev_priv_obj->range_2g_high,
-					      pdev_priv_obj->range_5g_low,
-					      pdev_priv_obj->range_5g_high,
-					      count)) {
-				return chan_list[count].center_freq;
-			}
-		}
-
-	reg_debug_rl("invalid channel %d", chan_num);
-	return 0;
-}
-
 #ifdef CONFIG_CHAN_NUM_API
 bool reg_chan_is_49ghz(struct wlan_objmgr_pdev *pdev, uint8_t chan_num)
 {
 	qdf_freq_t freq = 0;
 
-	freq = reg_chan_to_freq(pdev, chan_num);
+	freq = reg_legacy_chan_to_freq(pdev, chan_num);
 
 	return REG_IS_49GHZ_FREQ(freq) ? true : false;
 }

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

@@ -359,15 +359,6 @@ bool reg_is_dfs_ch(struct wlan_objmgr_pdev *pdev, uint8_t chan);
  */
 uint8_t reg_freq_to_chan(struct wlan_objmgr_pdev *pdev, qdf_freq_t freq);
 
-/**
- * reg_chan_to_freq() - Get frequency from channel number
- * @pdev: Pointer to pdev
- * @chan_num: Channel number
- *
- * Return: Channel frequency if success, otherwise 0
- */
-qdf_freq_t reg_chan_to_freq(struct wlan_objmgr_pdev *pdev, uint8_t chan_num);
-
 /**
  * reg_legacy_chan_to_freq() - Get freq from chan noumber, for 2G and 5G
  * @pdev: Pointer to pdev

+ 3 - 3
umac/regulatory/core/src/reg_utils.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2020 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2014-2021 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -369,7 +369,7 @@ bool reg_is_dsrc_chan(struct wlan_objmgr_pdev *pdev, uint8_t chan)
 	if (!REG_IS_5GHZ_CH(chan))
 		return false;
 
-	freq = reg_chan_to_freq(pdev, chan);
+	freq = reg_legacy_chan_to_freq(pdev, chan);
 
 	if (!(freq >= REG_DSRC_START_FREQ && freq <= REG_DSRC_END_FREQ))
 		return false;
@@ -425,7 +425,7 @@ bool reg_is_etsi13_srd_chan(struct wlan_objmgr_pdev *pdev, uint8_t chan)
 	if (!REG_IS_5GHZ_CH(chan))
 		return false;
 
-	freq = reg_chan_to_freq(pdev, chan);
+	freq = reg_legacy_chan_to_freq(pdev, chan);
 
 	if (!(freq >= REG_ETSI13_SRD_START_FREQ &&
 	      freq <= REG_ETSI13_SRD_END_FREQ))

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

@@ -925,15 +925,6 @@ bool wlan_reg_is_disable_ch(struct wlan_objmgr_pdev *pdev, uint8_t chan);
 uint8_t wlan_reg_freq_to_chan(struct wlan_objmgr_pdev *pdev,
 			      qdf_freq_t freq);
 
-/**
- * wlan_reg_chan_to_freq () - convert channel number to frequency
- * @chan: channel number
- *
- * Return: true or false
- */
-qdf_freq_t wlan_reg_chan_to_freq(struct wlan_objmgr_pdev *pdev,
-				 uint8_t chan);
-
 /**
  * wlan_reg_legacy_chan_to_freq () - convert chan to freq, for 2G and 5G
  * @chan: channel number

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

@@ -584,14 +584,6 @@ uint8_t wlan_reg_freq_to_chan(struct wlan_objmgr_pdev *pdev,
 
 qdf_export_symbol(wlan_reg_freq_to_chan);
 
-qdf_freq_t wlan_reg_chan_to_freq(struct wlan_objmgr_pdev *pdev,
-				 uint8_t chan_num)
-{
-	return reg_chan_to_freq(pdev, chan_num);
-}
-
-qdf_export_symbol(wlan_reg_chan_to_freq);
-
 qdf_freq_t wlan_reg_legacy_chan_to_freq(struct wlan_objmgr_pdev *pdev,
 					uint8_t chan_num)
 {