From db0def4e98ad03b637e3701b33ef5fbb33630014 Mon Sep 17 00:00:00 2001
From: Asutosh Mohapatra <quic_asutmoha@quicinc.com>
Date: Fri, 9 Sep 2022 14:16:41 +0530
Subject: [PATCH] qcacmn: Add cosmetic changes for fcc rule specific functions

Place extract_ext_fcc_rules_from_wmi function near its
caller and modify function definiton of empty function
reg_set_pdev_fcc_rules.

Change-Id: I6918addbe81bb410355616023e0c6dac534700b6
CRs-Fixed: 3286479
---
 .../regulatory/core/src/reg_build_chan_list.c |  2 +-
 wmi/src/wmi_unified_tlv.c                     | 69 +++++++++----------
 2 files changed, 35 insertions(+), 36 deletions(-)

diff --git a/umac/regulatory/core/src/reg_build_chan_list.c b/umac/regulatory/core/src/reg_build_chan_list.c
index 833b422371..8d4ce69c62 100644
--- a/umac/regulatory/core/src/reg_build_chan_list.c
+++ b/umac/regulatory/core/src/reg_build_chan_list.c
@@ -2901,7 +2901,7 @@ static void reg_set_pdev_fcc_rules(
 		     sizeof(struct cur_fcc_rule) * MAX_NUM_FCC_RULES);
 }
 #else
-static void reg_set_pdev_fcc_rules(
+static inline void reg_set_pdev_fcc_rules(
 		struct wlan_regulatory_psoc_priv_obj *psoc_priv_obj,
 		struct wlan_regulatory_pdev_priv_obj *pdev_priv_obj)
 {
diff --git a/wmi/src/wmi_unified_tlv.c b/wmi/src/wmi_unified_tlv.c
index 7cc4d8937e..5834a38006 100644
--- a/wmi/src/wmi_unified_tlv.c
+++ b/wmi/src/wmi_unified_tlv.c
@@ -15167,41 +15167,6 @@ static uint16_t wmi_set_htc_tx_tag_tlv(wmi_unified_t wmi_handle,
 }
 
 #ifdef CONFIG_BAND_6GHZ
-#ifdef CONFIG_REG_CLIENT
-/**
- * extract_ext_fcc_rules_from_wmi - extract fcc rules from WMI TLV
- * @num_fcc_rules: Number of FCC rules
- * @wmi_fcc_rule:  WMI FCC rules TLV
- *
- * Return fcc_rule_ptr
- */
-static struct cur_fcc_rule
-*extract_ext_fcc_rules_from_wmi(uint32_t num_fcc_rules,
-		wmi_regulatory_fcc_rule_struct *wmi_fcc_rule)
-{
-	struct cur_fcc_rule *fcc_rule_ptr;
-	uint32_t count;
-
-	if (!wmi_fcc_rule)
-		return NULL;
-
-	fcc_rule_ptr = qdf_mem_malloc(num_fcc_rules *
-				      sizeof(*fcc_rule_ptr));
-	if (!fcc_rule_ptr)
-		return NULL;
-
-	for (count = 0; count < num_fcc_rules; count++) {
-		fcc_rule_ptr[count].center_freq =
-			WMI_REG_FCC_RULE_CHAN_FREQ_GET(
-					wmi_fcc_rule[count].freq_info);
-		fcc_rule_ptr[count].tx_power =
-			WMI_REG_FCC_RULE_FCC_TX_POWER_GET(
-					wmi_fcc_rule[count].freq_info);
-	}
-
-	return fcc_rule_ptr;
-}
-#endif
 
 static struct cur_reg_rule
 *create_ext_reg_rules_from_wmi(uint32_t num_reg_rules,
@@ -15315,6 +15280,40 @@ static enum cc_setting_code wmi_reg_status_to_reg_status(
 #ifdef CONFIG_REG_CLIENT
 #define MAX_NUM_FCC_RULES 2
 
+/**
+ * extract_ext_fcc_rules_from_wmi - extract fcc rules from WMI TLV
+ * @num_fcc_rules: Number of FCC rules
+ * @wmi_fcc_rule:  WMI FCC rules TLV
+ *
+ * Return fcc_rule_ptr
+ */
+static struct cur_fcc_rule
+*extract_ext_fcc_rules_from_wmi(uint32_t num_fcc_rules,
+				wmi_regulatory_fcc_rule_struct *wmi_fcc_rule)
+{
+	struct cur_fcc_rule *fcc_rule_ptr;
+	uint32_t count;
+
+	if (!wmi_fcc_rule)
+		return NULL;
+
+	fcc_rule_ptr = qdf_mem_malloc(num_fcc_rules *
+				      sizeof(*fcc_rule_ptr));
+	if (!fcc_rule_ptr)
+		return NULL;
+
+	for (count = 0; count < num_fcc_rules; count++) {
+		fcc_rule_ptr[count].center_freq =
+			WMI_REG_FCC_RULE_CHAN_FREQ_GET(
+				wmi_fcc_rule[count].freq_info);
+		fcc_rule_ptr[count].tx_power =
+			WMI_REG_FCC_RULE_FCC_TX_POWER_GET(
+				wmi_fcc_rule[count].freq_info);
+	}
+
+	return fcc_rule_ptr;
+}
+
 /**
  * extract_reg_fcc_rules_tlv - Extract reg fcc rules TLV
  * @param_buf - Pointer to WMI params TLV