Skip to content

Commit ca6e514

Browse files
mistraubegregkh
authored andcommitted
staging: rtl8723bs: remove bPseudoTest from efuse_OneByteRead
The function efuse_OneByteRead 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-14-straube.linux@gmail.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 4558ec5 commit ca6e514

3 files changed

Lines changed: 11 additions & 27 deletions

File tree

drivers/staging/rtl8723bs/core/rtw_efuse.c

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,6 @@ u8 fakeBTEfuseModifiedMap[EFUSE_BT_MAX_MAP_LEN] = {0};
2929
#define REG_EFUSE_CTRL 0x0030
3030
#define EFUSE_CTRL REG_EFUSE_CTRL /* E-Fuse Control. */
3131

32-
static bool
33-
Efuse_Read1ByteFromFakeContent(u16 Offset, u8 *Value)
34-
{
35-
if (Offset >= EFUSE_MAX_HW_SIZE)
36-
return false;
37-
if (fakeEfuseBank == 0)
38-
*Value = fakeEfuseContent[Offset];
39-
else
40-
*Value = fakeBTEfuseContent[fakeEfuseBank - 1][Offset];
41-
return true;
42-
}
43-
4432
static bool
4533
Efuse_Write1ByteToFakeContent(u16 Offset, u8 Value)
4634
{
@@ -158,16 +146,12 @@ u8
158146
efuse_OneByteRead(
159147
struct adapter *padapter,
160148
u16 addr,
161-
u8 *data,
162-
bool bPseudoTest)
149+
u8 *data)
163150
{
164151
u32 tmpidx = 0;
165152
u8 bResult;
166153
u8 readbyte;
167154

168-
if (bPseudoTest)
169-
return Efuse_Read1ByteFromFakeContent(addr, data);
170-
171155
/* <20130121, Kordan> For SMIC EFUSE specificatoin. */
172156
/* 0x34[11]: SW force PGMEN input of efuse to high. (for the bank selected by 0x34[9:8]) */
173157
/* PHY_SetMacReg(padapter, 0x34, BIT11, 0); */

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -679,15 +679,15 @@ static void hal_ReadEFuse_WiFi(
679679
hal_EfuseSwitchToBank(padapter, 0);
680680

681681
while (AVAILABLE_EFUSE_ADDR(eFuse_Addr)) {
682-
efuse_OneByteRead(padapter, eFuse_Addr++, &efuseHeader, false);
682+
efuse_OneByteRead(padapter, eFuse_Addr++, &efuseHeader);
683683
if (efuseHeader == 0xFF)
684684
break;
685685

686686
/* Check PG header for section num. */
687687
if (EXT_HEADER(efuseHeader)) { /* extended header */
688688
offset = GET_HDR_OFFSET_2_0(efuseHeader);
689689

690-
efuse_OneByteRead(padapter, eFuse_Addr++, &efuseExtHdr, false);
690+
efuse_OneByteRead(padapter, eFuse_Addr++, &efuseExtHdr);
691691
if (ALL_WORDS_DISABLED(efuseExtHdr))
692692
continue;
693693

@@ -706,10 +706,10 @@ static void hal_ReadEFuse_WiFi(
706706
for (i = 0; i < EFUSE_MAX_WORD_UNIT; i++) {
707707
/* Check word enable condition in the section */
708708
if (!(wden & (0x01<<i))) {
709-
efuse_OneByteRead(padapter, eFuse_Addr++, &efuseData, false);
709+
efuse_OneByteRead(padapter, eFuse_Addr++, &efuseData);
710710
efuseTbl[addr] = efuseData;
711711

712-
efuse_OneByteRead(padapter, eFuse_Addr++, &efuseData, false);
712+
efuse_OneByteRead(padapter, eFuse_Addr++, &efuseData);
713713
efuseTbl[addr+1] = efuseData;
714714
}
715715
addr += 2;
@@ -772,15 +772,15 @@ static void hal_ReadEFuse_BT(
772772
eFuse_Addr = 0;
773773

774774
while (AVAILABLE_EFUSE_ADDR(eFuse_Addr)) {
775-
efuse_OneByteRead(padapter, eFuse_Addr++, &efuseHeader, false);
775+
efuse_OneByteRead(padapter, eFuse_Addr++, &efuseHeader);
776776
if (efuseHeader == 0xFF)
777777
break;
778778

779779
/* Check PG header for section num. */
780780
if (EXT_HEADER(efuseHeader)) { /* extended header */
781781
offset = GET_HDR_OFFSET_2_0(efuseHeader);
782782

783-
efuse_OneByteRead(padapter, eFuse_Addr++, &efuseExtHdr, false);
783+
efuse_OneByteRead(padapter, eFuse_Addr++, &efuseExtHdr);
784784
if (ALL_WORDS_DISABLED(efuseExtHdr))
785785
continue;
786786

@@ -798,10 +798,10 @@ static void hal_ReadEFuse_BT(
798798
for (i = 0; i < EFUSE_MAX_WORD_UNIT; i++) {
799799
/* Check word enable condition in the section */
800800
if (!(wden & (0x01<<i))) {
801-
efuse_OneByteRead(padapter, eFuse_Addr++, &efuseData, false);
801+
efuse_OneByteRead(padapter, eFuse_Addr++, &efuseData);
802802
efuseTbl[addr] = efuseData;
803803

804-
efuse_OneByteRead(padapter, eFuse_Addr++, &efuseData, false);
804+
efuse_OneByteRead(padapter, eFuse_Addr++, &efuseData);
805805
efuseTbl[addr+1] = efuseData;
806806
}
807807
addr += 2;
@@ -1475,7 +1475,7 @@ void Hal_EfuseParsePackageType_8723B(
14751475
u8 efuseContent;
14761476

14771477
Efuse_PowerSwitch(padapter, false, true);
1478-
efuse_OneByteRead(padapter, 0x1FB, &efuseContent, false);
1478+
efuse_OneByteRead(padapter, 0x1FB, &efuseContent);
14791479
Efuse_PowerSwitch(padapter, false, false);
14801480

14811481
package = efuseContent & 0x7;

drivers/staging/rtl8723bs/include/rtw_efuse.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ extern u8 fakeBTEfuseModifiedMap[];
9191
/*------------------------Export global variable----------------------------*/
9292

9393
u8 Efuse_CalculateWordCnts(u8 word_en);
94-
u8 efuse_OneByteRead(struct adapter *padapter, u16 addr, u8 *data, bool bPseudoTest);
94+
u8 efuse_OneByteRead(struct adapter *padapter, u16 addr, u8 *data);
9595
u8 efuse_OneByteWrite(struct adapter *padapter, u16 addr, u8 data, bool bPseudoTest);
9696

9797
void Efuse_PowerSwitch(struct adapter *padapter, u8 bWrite, u8 PwrState);

0 commit comments

Comments
 (0)