Skip to content

Commit 0e3565c

Browse files
Philipp Hortmanngregkh
authored andcommitted
staging: rtl8723bs: Remove function pointer EfuseGetCurrentSize
Remove function pointer EfuseGetCurrentSize and use Hal_EfuseGetCurrentSize directly to increase readability. Signed-off-by: Philipp Hortmann <[email protected]> Link: https://lore.kernel.org/r/58a991eeda12ccb69fe8b81ef1bb2fe3c5aa364b.1730916582.git.philipp.g.hortmann@gmail.com Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent fa152ee commit 0e3565c

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

drivers/staging/rtl8723bs/core/rtw_efuse.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,7 @@ Efuse_GetCurrentSize(
102102
u8 efuseType,
103103
bool bPseudoTest)
104104
{
105-
return padapter->HalFunc.EfuseGetCurrentSize(padapter, efuseType,
106-
bPseudoTest);
105+
return Hal_EfuseGetCurrentSize(padapter, efuseType, bPseudoTest);
107106
}
108107

109108
/* 11/16/2008 MH Add description. Get current efuse area enabled word!!. */

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1072,7 +1072,7 @@ static u16 hal_EfuseGetCurrentSize_BT(struct adapter *padapter, u8 bPseudoTest)
10721072
return retU2;
10731073
}
10741074

1075-
static u16 Hal_EfuseGetCurrentSize(
1075+
u16 Hal_EfuseGetCurrentSize(
10761076
struct adapter *padapter, u8 efuseType, bool bPseudoTest
10771077
)
10781078
{
@@ -1745,7 +1745,6 @@ void UpdateHalRAMask8723B(struct adapter *padapter, u32 mac_id, u8 rssi_level)
17451745
void rtl8723b_set_hal_ops(struct hal_ops *pHalFunc)
17461746
{
17471747
/* Efuse related function */
1748-
pHalFunc->EfuseGetCurrentSize = &Hal_EfuseGetCurrentSize;
17491748
pHalFunc->Efuse_PgPacketRead = &Hal_EfusePgPacketRead;
17501749
pHalFunc->Efuse_PgPacketWrite = &Hal_EfusePgPacketWrite;
17511750
pHalFunc->Efuse_WordEnableDataWrite = &Hal_EfuseWordEnableDataWrite;

drivers/staging/rtl8723bs/include/hal_intf.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,6 @@ typedef s32 (*c2h_id_filter)(u8 *c2h_evt);
164164
struct hal_ops {
165165
void (*SetHalODMVarHandler)(struct adapter *padapter, enum hal_odm_variable eVariable, void *pValue1, bool bSet);
166166

167-
u16 (*EfuseGetCurrentSize)(struct adapter *padapter, u8 efuseType, bool bPseudoTest);
168167
int (*Efuse_PgPacketRead)(struct adapter *padapter, u8 offset, u8 *data, bool bPseudoTest);
169168
int (*Efuse_PgPacketWrite)(struct adapter *padapter, u8 offset, u8 word_en, u8 *data, bool bPseudoTest);
170169
u8 (*Efuse_WordEnableDataWrite)(struct adapter *padapter, u16 efuse_addr, u8 word_en, u8 *data, bool bPseudoTest);
@@ -291,4 +290,5 @@ void Hal_ReadEFuse(struct adapter *padapter, u8 efuseType, u16 _offset,
291290
u16 _size_byte, u8 *pbuf, bool bPseudoTest);
292291
void Hal_GetEfuseDefinition(struct adapter *padapter, u8 efuseType, u8 type,
293292
void *pOut, bool bPseudoTest);
293+
u16 Hal_EfuseGetCurrentSize(struct adapter *padapter, u8 efuseType, bool bPseudoTest);
294294
#endif /* __HAL_INTF_H__ */

0 commit comments

Comments
 (0)