staging: rtl8723bs: Remove function pointer EFUSEGetEfuseDefinition

Remove function pointer EFUSEGetEfuseDefinition and use
Hal_GetEfuseDefinition directly to increase readability.

Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/a203a6b2558ea0af5811d8c5841b10b7bbf2e9ff.1730916582.git.philipp.g.hortmann@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723bs/core/rtw_efuse.c b/drivers/staging/rtl8723bs/core/rtw_efuse.c
index b6c655e6747e0dc022c0add0c61afdb0afd8ea78..b8023e9d7631e0daf53296cb2115f34ece0ac4af 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_efuse.c
+++ b/drivers/staging/rtl8723bs/core/rtw_efuse.c
@@ -171,7 +171,7 @@ EFUSE_GetEfuseDefinition(
        bool            bPseudoTest
        )
 {
-       padapter->HalFunc.EFUSEGetEfuseDefinition(padapter, efuseType, type, pOut, bPseudoTest);
+       Hal_GetEfuseDefinition(padapter, efuseType, type, pOut, bPseudoTest);
 }
 
 /*-----------------------------------------------------------------------------

diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
index 2d2de56d5df7c2c9a689f04a53f059ab148cde89..8a4ebe6457868ffb71e46f48792579e98cf383ec 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
@@ -490,7 +490,7 @@ static u8 hal_EfuseSwitchToBank(
        return bRet;
 }
 
-static void Hal_GetEfuseDefinition(
+void Hal_GetEfuseDefinition(
        struct adapter *padapter,
        u8 efuseType,
        u8 type,
@@ -1745,7 +1745,6 @@ void UpdateHalRAMask8723B(struct adapter *padapter, u32 mac_id, u8 rssi_level)
 void rtl8723b_set_hal_ops(struct hal_ops *pHalFunc)
 {
        /*  Efuse related function */
-       pHalFunc->EFUSEGetEfuseDefinition = &Hal_GetEfuseDefinition;
        pHalFunc->EfuseGetCurrentSize = &Hal_EfuseGetCurrentSize;
        pHalFunc->Efuse_PgPacketRead = &Hal_EfusePgPacketRead;
        pHalFunc->Efuse_PgPacketWrite = &Hal_EfusePgPacketWrite;

diff --git a/drivers/staging/rtl8723bs/include/hal_intf.h b/drivers/staging/rtl8723bs/include/hal_intf.h
index 2285e82ab7b2952f9e8a7260675fee119154f086..a513721e763b0a2ae320d0b5ab3d6096dd86b8cf 100644 (file)
--- a/drivers/staging/rtl8723bs/include/hal_intf.h
+++ b/drivers/staging/rtl8723bs/include/hal_intf.h
@@ -164,7 +164,6 @@ typedef s32 (*c2h_id_filter)(u8 *c2h_evt);
 struct hal_ops {
        void (*SetHalODMVarHandler)(struct adapter *padapter, enum hal_odm_variable eVariable, void *pValue1, bool bSet);
 
-       void (*EFUSEGetEfuseDefinition)(struct adapter *padapter, u8 efuseType, u8 type, void *pOut, bool bPseudoTest);
        u16 (*EfuseGetCurrentSize)(struct adapter *padapter, u8 efuseType, bool bPseudoTest);
        int     (*Efuse_PgPacketRead)(struct adapter *padapter, u8 offset, u8 *data, bool bPseudoTest);
        int     (*Efuse_PgPacketWrite)(struct adapter *padapter, u8 offset, u8 word_en, u8 *data, bool bPseudoTest);
@@ -290,4 +289,6 @@ void rtl8723b_SetBeaconRelatedRegisters(struct adapter *padapter);
 void Hal_EfusePowerSwitch(struct adapter *padapter, u8 bWrite, u8 PwrState);
 void Hal_ReadEFuse(struct adapter *padapter, u8 efuseType, u16 _offset,
                   u16 _size_byte, u8 *pbuf, bool bPseudoTest);
+void Hal_GetEfuseDefinition(struct adapter *padapter, u8 efuseType, u8 type,
+                           void *pOut, bool bPseudoTest);
 #endif /* __HAL_INTF_H__ */