Skip to content

Commit 4d170e2

Browse files
mistraubegregkh
authored andcommitted
staging: rtl8723bs: remove bPseudoTest from hal_EfuseSwitchToBank
The function hal_EfuseSwitchToBank is always called with bPseudoTest set to false. Remove the pPseudoTest parameter and reomve resulting dead code to reduce code complexity. Signed-off-by: Michael Straube <straube.linux@gmail.com> Link: https://lore.kernel.org/r/20250823124321.485910-12-straube.linux@gmail.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 127fae1 commit 4d170e2

1 file changed

Lines changed: 24 additions & 38 deletions

File tree

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c

Lines changed: 24 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -445,47 +445,33 @@ void rtl8723b_InitializeFirmwareVars(struct adapter *padapter)
445445
/* Efuse related code */
446446
/* */
447447
static u8 hal_EfuseSwitchToBank(
448-
struct adapter *padapter, u8 bank, bool bPseudoTest
448+
struct adapter *padapter, u8 bank
449449
)
450450
{
451451
u8 bRet = false;
452452
u32 value32 = 0;
453-
#ifdef HAL_EFUSE_MEMORY
454-
struct hal_com_data *pHalData = GET_HAL_DATA(padapter);
455-
struct efuse_hal *pEfuseHal = &pHalData->EfuseHal;
456-
#endif
457453

458-
459-
if (bPseudoTest) {
460-
#ifdef HAL_EFUSE_MEMORY
461-
pEfuseHal->fakeEfuseBank = bank;
462-
#else
463-
fakeEfuseBank = bank;
464-
#endif
465-
bRet = true;
466-
} else {
467-
value32 = rtw_read32(padapter, EFUSE_TEST);
468-
bRet = true;
469-
switch (bank) {
470-
case 0:
471-
value32 = (value32 & ~EFUSE_SEL_MASK) | EFUSE_SEL(EFUSE_WIFI_SEL_0);
472-
break;
473-
case 1:
474-
value32 = (value32 & ~EFUSE_SEL_MASK) | EFUSE_SEL(EFUSE_BT_SEL_0);
475-
break;
476-
case 2:
477-
value32 = (value32 & ~EFUSE_SEL_MASK) | EFUSE_SEL(EFUSE_BT_SEL_1);
478-
break;
479-
case 3:
480-
value32 = (value32 & ~EFUSE_SEL_MASK) | EFUSE_SEL(EFUSE_BT_SEL_2);
481-
break;
482-
default:
483-
value32 = (value32 & ~EFUSE_SEL_MASK) | EFUSE_SEL(EFUSE_WIFI_SEL_0);
484-
bRet = false;
485-
break;
486-
}
487-
rtw_write32(padapter, EFUSE_TEST, value32);
454+
value32 = rtw_read32(padapter, EFUSE_TEST);
455+
bRet = true;
456+
switch (bank) {
457+
case 0:
458+
value32 = (value32 & ~EFUSE_SEL_MASK) | EFUSE_SEL(EFUSE_WIFI_SEL_0);
459+
break;
460+
case 1:
461+
value32 = (value32 & ~EFUSE_SEL_MASK) | EFUSE_SEL(EFUSE_BT_SEL_0);
462+
break;
463+
case 2:
464+
value32 = (value32 & ~EFUSE_SEL_MASK) | EFUSE_SEL(EFUSE_BT_SEL_1);
465+
break;
466+
case 3:
467+
value32 = (value32 & ~EFUSE_SEL_MASK) | EFUSE_SEL(EFUSE_BT_SEL_2);
468+
break;
469+
default:
470+
value32 = (value32 & ~EFUSE_SEL_MASK) | EFUSE_SEL(EFUSE_WIFI_SEL_0);
471+
bRet = false;
472+
break;
488473
}
474+
rtw_write32(padapter, EFUSE_TEST, value32);
489475

490476
return bRet;
491477
}
@@ -692,7 +678,7 @@ static void hal_ReadEFuse_WiFi(
692678
memset(efuseTbl, 0xFF, EFUSE_MAX_MAP_LEN);
693679

694680
/* switch bank back to bank 0 for later BT and wifi use. */
695-
hal_EfuseSwitchToBank(padapter, 0, false);
681+
hal_EfuseSwitchToBank(padapter, 0);
696682

697683
while (AVAILABLE_EFUSE_ADDR(eFuse_Addr)) {
698684
efuse_OneByteRead(padapter, eFuse_Addr++, &efuseHeader, false);
@@ -782,7 +768,7 @@ static void hal_ReadEFuse_BT(
782768
Hal_GetEfuseDefinition(padapter, EFUSE_BT, TYPE_AVAILABLE_EFUSE_BYTES_BANK, &total);
783769

784770
for (bank = 1; bank < 3; bank++) { /* 8723b Max bake 0~2 */
785-
if (hal_EfuseSwitchToBank(padapter, bank, false) == false)
771+
if (hal_EfuseSwitchToBank(padapter, bank) == false)
786772
goto exit;
787773

788774
eFuse_Addr = 0;
@@ -833,7 +819,7 @@ static void hal_ReadEFuse_BT(
833819
}
834820

835821
/* switch bank back to bank 0 for later BT and wifi use. */
836-
hal_EfuseSwitchToBank(padapter, 0, false);
822+
hal_EfuseSwitchToBank(padapter, 0);
837823

838824
/* Copy from Efuse map to output pointer memory!!! */
839825
for (i = 0; i < _size_byte; i++)

0 commit comments

Comments
 (0)