Skip to content

Commit fa152ee

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

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

drivers/staging/rtl8723bs/core/rtw_efuse.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ EFUSE_GetEfuseDefinition(
171171
bool bPseudoTest
172172
)
173173
{
174-
padapter->HalFunc.EFUSEGetEfuseDefinition(padapter, efuseType, type, pOut, bPseudoTest);
174+
Hal_GetEfuseDefinition(padapter, efuseType, type, pOut, bPseudoTest);
175175
}
176176

177177
/*-----------------------------------------------------------------------------

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -490,7 +490,7 @@ static u8 hal_EfuseSwitchToBank(
490490
return bRet;
491491
}
492492

493-
static void Hal_GetEfuseDefinition(
493+
void Hal_GetEfuseDefinition(
494494
struct adapter *padapter,
495495
u8 efuseType,
496496
u8 type,
@@ -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->EFUSEGetEfuseDefinition = &Hal_GetEfuseDefinition;
17491748
pHalFunc->EfuseGetCurrentSize = &Hal_EfuseGetCurrentSize;
17501749
pHalFunc->Efuse_PgPacketRead = &Hal_EfusePgPacketRead;
17511750
pHalFunc->Efuse_PgPacketWrite = &Hal_EfusePgPacketWrite;

drivers/staging/rtl8723bs/include/hal_intf.h

Lines changed: 2 additions & 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-
void (*EFUSEGetEfuseDefinition)(struct adapter *padapter, u8 efuseType, u8 type, void *pOut, bool bPseudoTest);
168167
u16 (*EfuseGetCurrentSize)(struct adapter *padapter, u8 efuseType, bool bPseudoTest);
169168
int (*Efuse_PgPacketRead)(struct adapter *padapter, u8 offset, u8 *data, bool bPseudoTest);
170169
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);
290289
void Hal_EfusePowerSwitch(struct adapter *padapter, u8 bWrite, u8 PwrState);
291290
void Hal_ReadEFuse(struct adapter *padapter, u8 efuseType, u16 _offset,
292291
u16 _size_byte, u8 *pbuf, bool bPseudoTest);
292+
void Hal_GetEfuseDefinition(struct adapter *padapter, u8 efuseType, u8 type,
293+
void *pOut, bool bPseudoTest);
293294
#endif /* __HAL_INTF_H__ */

0 commit comments

Comments
 (0)