[PATCH] staging: rtl8723bs: Eliminate dead enum hal_status abstraction
From: Marinela Tatiana Selseth
Date: Fri Oct 02 2026 - 15:48:15 EST
The internal driver configuration functions inside odm_HWConfig.c always
hardcode a return of HAL_STATUS_SUCCESS and never fail. Consequently,
the custom vendor wrapper type 'enum hal_status' is a completely
redundant abstraction layer that introduces unnecessary complexity.
Refactor ODM_ConfigRFWithHeaderFile(), ODM_ConfigBBWithHeaderFile(),
and ODM_ConfigRFWithTxPwrTrackHeaderFile() to return standard 'void',
removing the useless success return paths. Additionally, purge the
unused ghost prototype ODM_ConfigFWWithHeaderFile() from the header and
completely eliminate the now-vacant 'enum hal_status' declaration block
from odm_types.h.
Signed-off-by: Marinela Tatiana Selseth <marinela.selseth@xxxxxxxxxxxxxxxxxx>
---
drivers/staging/rtl8723bs/hal/odm_HWConfig.c | 13 +++----------
drivers/staging/rtl8723bs/hal/odm_HWConfig.h | 13 +++----------
drivers/staging/rtl8723bs/hal/odm_types.h | 5 -----
3 files changed, 6 insertions(+), 25 deletions(-)
diff --git a/drivers/staging/rtl8723bs/hal/odm_HWConfig.c b/drivers/staging/rtl8723bs/hal/odm_HWConfig.c
index 1716252641d3..437cac9ba0dd 100644
--- a/drivers/staging/rtl8723bs/hal/odm_HWConfig.c
+++ b/drivers/staging/rtl8723bs/hal/odm_HWConfig.c
@@ -401,7 +401,7 @@ void odm_phy_status_query(struct dm_odm_t *dm_odm, struct odm_phy_info *phy_info
/* */
/* */
-enum hal_status ODM_ConfigRFWithHeaderFile(
+void ODM_ConfigRFWithHeaderFile(
struct dm_odm_t *pDM_Odm,
enum ODM_RF_Config_Type ConfigType,
enum rf_path eRFPath
@@ -411,19 +411,15 @@ enum hal_status ODM_ConfigRFWithHeaderFile(
ODM_ReadAndConfig_MP_8723B_RadioA(pDM_Odm);
else if (ConfigType == CONFIG_RF_TXPWR_LMT)
ODM_ReadAndConfig_MP_8723B_TXPWR_LMT(pDM_Odm);
-
- return HAL_STATUS_SUCCESS;
}
-enum hal_status ODM_ConfigRFWithTxPwrTrackHeaderFile(struct dm_odm_t *pDM_Odm)
+void ODM_ConfigRFWithTxPwrTrackHeaderFile(struct dm_odm_t *pDM_Odm)
{
if (pDM_Odm->SupportInterface == ODM_ITRF_SDIO)
ODM_ReadAndConfig_MP_8723B_TxPowerTrack_SDIO(pDM_Odm);
-
- return HAL_STATUS_SUCCESS;
}
-enum hal_status ODM_ConfigBBWithHeaderFile(
+void ODM_ConfigBBWithHeaderFile(
struct dm_odm_t *pDM_Odm, enum ODM_BB_Config_Type ConfigType
)
{
@@ -433,7 +429,4 @@ enum hal_status ODM_ConfigBBWithHeaderFile(
ODM_ReadAndConfig_MP_8723B_AGC_TAB(pDM_Odm);
else if (ConfigType == CONFIG_BB_PHY_REG_PG)
ODM_ReadAndConfig_MP_8723B_PHY_REG_PG(pDM_Odm);
-
- return HAL_STATUS_SUCCESS;
}
-
diff --git a/drivers/staging/rtl8723bs/hal/odm_HWConfig.h b/drivers/staging/rtl8723bs/hal/odm_HWConfig.h
index 615145812ed2..3945aff7d4e6 100644
--- a/drivers/staging/rtl8723bs/hal/odm_HWConfig.h
+++ b/drivers/staging/rtl8723bs/hal/odm_HWConfig.h
@@ -61,25 +61,18 @@ struct phy_status_rpt_8192cd_t {
void odm_phy_status_query(struct dm_odm_t *dm_odm, struct odm_phy_info *phy_info,
u8 *phy_status, struct odm_packet_info *pkt_info);
-enum hal_status ODM_ConfigRFWithTxPwrTrackHeaderFile(struct dm_odm_t *pDM_Odm);
+void ODM_ConfigRFWithTxPwrTrackHeaderFile(struct dm_odm_t *pDM_Odm);
-enum hal_status ODM_ConfigRFWithHeaderFile(
+void ODM_ConfigRFWithHeaderFile(
struct dm_odm_t *pDM_Odm,
enum ODM_RF_Config_Type ConfigType,
enum rf_path eRFPath
);
-enum hal_status ODM_ConfigBBWithHeaderFile(
+void ODM_ConfigBBWithHeaderFile(
struct dm_odm_t *pDM_Odm, enum ODM_BB_Config_Type ConfigType
);
-enum hal_status ODM_ConfigFWWithHeaderFile(
- struct dm_odm_t *pDM_Odm,
- enum ODM_FW_Config_Type ConfigType,
- u8 *pFirmware,
- u32 *pSize
-);
-
s32 odm_signal_scale_mapping(struct dm_odm_t *pDM_Odm, s32 CurrSig);
#endif
diff --git a/drivers/staging/rtl8723bs/hal/odm_types.h b/drivers/staging/rtl8723bs/hal/odm_types.h
index 25f0edd716cc..f5a02a79ead1 100644
--- a/drivers/staging/rtl8723bs/hal/odm_types.h
+++ b/drivers/staging/rtl8723bs/hal/odm_types.h
@@ -15,11 +15,6 @@
#define GET_ODM(__padapter) ((PDM_ODM_T)(&((GET_HAL_DATA(__padapter))->odmpriv)))
-enum hal_status {
- HAL_STATUS_SUCCESS,
- HAL_STATUS_FAILURE,
-};
-
#if defined(__LITTLE_ENDIAN)
#define ODM_ENDIAN_TYPE ODM_ENDIAN_LITTLE
#else
--
2.43.0