[PATCH 54/61] staging: rtl8723bs: inline SetHalODMVar into rtw_hal_set_odm_var

[Arsenii Pashchenko]

Inline the hardware configuration logic from SetHalODMVar directly
into rtw_hal_set_odm_var. This eliminates a redundant CamelCase layer
and simplifies the interface for updating ODM variables.

Signed-off-by: Arsenii Pashchenko <ulijg308@xxxxxxxxx>
---
 drivers/staging/rtl8723bs/hal/hal_com.c     | 36 ---------------------
 drivers/staging/rtl8723bs/hal/hal_intf.c    | 33 ++++++++++++++++++-
 drivers/staging/rtl8723bs/include/hal_com.h |  5 ---
 3 files changed, 32 insertions(+), 42 deletions(-)

diff --git a/drivers/staging/rtl8723bs/hal/hal_com.c b/drivers/staging/rtl8723bs/hal/hal_com.c
index 0a0b41ebe..3d6b59c24 100644
--- a/drivers/staging/rtl8723bs/hal/hal_com.c
+++ b/drivers/staging/rtl8723bs/hal/hal_com.c
@@ -643,42 +643,6 @@ u8 GetHalDefVar(
 	return bResult;
 }
 
-void SetHalODMVar(
-	struct adapter *Adapter,
-	enum hal_odm_variable eVariable,
-	void *pValue1,
-	bool bSet
-)
-{
-	struct hal_com_data	*pHalData = GET_HAL_DATA(Adapter);
-	struct dm_odm_t *podmpriv = &pHalData->odmpriv;
-	/* _irqL irqL; */
-	switch (eVariable) {
-	case HAL_ODM_STA_INFO:
-		{
-			struct sta_info *psta = pValue1;
-
-			if (bSet) {
-				ODM_CmnInfoPtrArrayHook(podmpriv, ODM_CMNINFO_STA_STATUS, psta->mac_id, psta);
-			} else {
-				/* spin_lock_bh(&pHalData->odm_stainfo_lock); */
-				ODM_CmnInfoPtrArrayHook(podmpriv, ODM_CMNINFO_STA_STATUS, psta->mac_id, NULL);
-
-				/* spin_unlock_bh(&pHalData->odm_stainfo_lock); */
-		    }
-		}
-		break;
-	case HAL_ODM_P2P_STATE:
-			ODM_CmnInfoUpdate(podmpriv, ODM_CMNINFO_WIFI_DIRECT, bSet);
-		break;
-	case HAL_ODM_WIFI_DISPLAY_STATE:
-			ODM_CmnInfoUpdate(podmpriv, ODM_CMNINFO_WIFI_DISPLAY, bSet);
-		break;
-
-	default:
-		break;
-	}
-}
 
 bool GetU1ByteIntegerFromStringInDecimal(char *Str, u8 *pInt)
 {
diff --git a/drivers/staging/rtl8723bs/hal/hal_intf.c b/drivers/staging/rtl8723bs/hal/hal_intf.c
index 2c50fa5c0..d2e310115 100644
--- a/drivers/staging/rtl8723bs/hal/hal_intf.c
+++ b/drivers/staging/rtl8723bs/hal/hal_intf.c
@@ -161,7 +161,38 @@ u8 rtw_hal_get_def_var(struct adapter *padapter, enum hal_def_variable eVariable
 
 void rtw_hal_set_odm_var(struct adapter *padapter, enum hal_odm_variable eVariable, void *pValue1, bool bSet)
 {
-	SetHalODMVar(padapter, eVariable, pValue1, bSet);
+	struct hal_com_data	*pHalData = GET_HAL_DATA(padapter);
+	struct dm_odm_t *podmpriv = &pHalData->odmpriv;
+	/* _irqL irqL; */
+	switch (eVariable) {
+	case HAL_ODM_STA_INFO:
+		{
+			struct sta_info *psta = pValue1;
+
+			if (bSet) {
+				ODM_CmnInfoPtrArrayHook(
+					podmpriv, ODM_CMNINFO_STA_STATUS, psta->mac_id, psta
+				);
+			} else {
+				/* spin_lock_bh(&pHalData->odm_stainfo_lock); */
+				ODM_CmnInfoPtrArrayHook(
+					podmpriv, ODM_CMNINFO_STA_STATUS, psta->mac_id, NULL
+				);
+
+				/* spin_unlock_bh(&pHalData->odm_stainfo_lock); */
+			}
+		}
+		break;
+	case HAL_ODM_P2P_STATE:
+			ODM_CmnInfoUpdate(podmpriv, ODM_CMNINFO_WIFI_DIRECT, bSet);
+		break;
+	case HAL_ODM_WIFI_DISPLAY_STATE:
+			ODM_CmnInfoUpdate(podmpriv, ODM_CMNINFO_WIFI_DISPLAY, bSet);
+		break;
+
+	default:
+		break;
+	};
 }
 
 u8 rtw_hal_check_ips_status(struct adapter *padapter)
diff --git a/drivers/staging/rtl8723bs/include/hal_com.h b/drivers/staging/rtl8723bs/include/hal_com.h
index 962ba3aaa..79bb60c5c 100644
--- a/drivers/staging/rtl8723bs/include/hal_com.h
+++ b/drivers/staging/rtl8723bs/include/hal_com.h
@@ -141,9 +141,4 @@ bool GetU1ByteIntegerFromStringInDecimal(char *str, u8 *in);
 
 void rtw_bb_rf_gain_offset(struct adapter *padapter);
 
-void SetHalODMVar(
-	struct adapter *Adapter,
-	enum hal_odm_variable		eVariable,
-	void *pValue1,
-	bool					bSet);
 #endif /* __HAL_COMMON_H__ */
-- 
2.55.0