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>

diff --git a/drivers/staging/rtl8723bs/core/rtw_efuse.c b/drivers/staging/rtl8723bs/core/rtw_efuse.c
index 9d065721c28a6352253b4c365c1f1d9d1bb8366e..c4542e00c730bb0aedbb53cbcd265880c1814cb7 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_efuse.c
+++ b/drivers/staging/rtl8723bs/core/rtw_efuse.c
@@ -29,18 +29,6 @@ u8 fakeBTEfuseModifiedMap[EFUSE_BT_MAX_MAP_LEN] = {0};
 #define REG_EFUSE_CTRL         0x0030
 #define EFUSE_CTRL                     REG_EFUSE_CTRL          /*  E-Fuse Control. */
 
-static bool
-Efuse_Read1ByteFromFakeContent(u16 Offset, u8 *Value)
-{
-       if (Offset >= EFUSE_MAX_HW_SIZE)
-               return false;
-       if (fakeEfuseBank == 0)
-               *Value = fakeEfuseContent[Offset];
-       else
-               *Value = fakeBTEfuseContent[fakeEfuseBank - 1][Offset];
-       return true;
-}
-
 static bool
 Efuse_Write1ByteToFakeContent(u16 Offset, u8 Value)
 {
@@ -158,16 +146,12 @@ u8
 efuse_OneByteRead(
 struct adapter *padapter,
 u16    addr,
-u8     *data,
-bool           bPseudoTest)
+u8     *data)
 {
        u32 tmpidx = 0;
        u8 bResult;
        u8 readbyte;
 
-       if (bPseudoTest)
-               return Efuse_Read1ByteFromFakeContent(addr, data);
-
        /*  <20130121, Kordan> For SMIC EFUSE specificatoin. */
        /* 0x34[11]: SW force PGMEN input of efuse to high. (for the bank selected by 0x34[9:8]) */
        /* PHY_SetMacReg(padapter, 0x34, BIT11, 0); */

diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
index ab30d259882507190efc72dd46916b752f868488..94492743ea34c508df79353ca5f12f883bcad537 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
@@ -679,7 +679,7 @@ static void hal_ReadEFuse_WiFi(
        hal_EfuseSwitchToBank(padapter, 0);
 
        while (AVAILABLE_EFUSE_ADDR(eFuse_Addr)) {
-               efuse_OneByteRead(padapter, eFuse_Addr++, &efuseHeader, false);
+               efuse_OneByteRead(padapter, eFuse_Addr++, &efuseHeader);
                if (efuseHeader == 0xFF)
                        break;
 
@@ -687,7 +687,7 @@ static void hal_ReadEFuse_WiFi(
                if (EXT_HEADER(efuseHeader)) { /* extended header */
                        offset = GET_HDR_OFFSET_2_0(efuseHeader);
 
-                       efuse_OneByteRead(padapter, eFuse_Addr++, &efuseExtHdr, false);
+                       efuse_OneByteRead(padapter, eFuse_Addr++, &efuseExtHdr);
                        if (ALL_WORDS_DISABLED(efuseExtHdr))
                                continue;
 
@@ -706,10 +706,10 @@ static void hal_ReadEFuse_WiFi(
                        for (i = 0; i < EFUSE_MAX_WORD_UNIT; i++) {
                                /*  Check word enable condition in the section */
                                if (!(wden & (0x01<<i))) {
-                                       efuse_OneByteRead(padapter, eFuse_Addr++, &efuseData, false);
+                                       efuse_OneByteRead(padapter, eFuse_Addr++, &efuseData);
                                        efuseTbl[addr] = efuseData;
 
-                                       efuse_OneByteRead(padapter, eFuse_Addr++, &efuseData, false);
+                                       efuse_OneByteRead(padapter, eFuse_Addr++, &efuseData);
                                        efuseTbl[addr+1] = efuseData;
                                }
                                addr += 2;
@@ -772,7 +772,7 @@ static void hal_ReadEFuse_BT(
                eFuse_Addr = 0;
 
                while (AVAILABLE_EFUSE_ADDR(eFuse_Addr)) {
-                       efuse_OneByteRead(padapter, eFuse_Addr++, &efuseHeader, false);
+                       efuse_OneByteRead(padapter, eFuse_Addr++, &efuseHeader);
                        if (efuseHeader == 0xFF)
                                break;
 
@@ -780,7 +780,7 @@ static void hal_ReadEFuse_BT(
                        if (EXT_HEADER(efuseHeader)) { /* extended header */
                                offset = GET_HDR_OFFSET_2_0(efuseHeader);
 
-                               efuse_OneByteRead(padapter, eFuse_Addr++, &efuseExtHdr, false);
+                               efuse_OneByteRead(padapter, eFuse_Addr++, &efuseExtHdr);
                                if (ALL_WORDS_DISABLED(efuseExtHdr))
                                        continue;
 
@@ -798,10 +798,10 @@ static void hal_ReadEFuse_BT(
                                for (i = 0; i < EFUSE_MAX_WORD_UNIT; i++) {
                                        /*  Check word enable condition in the section */
                                        if (!(wden & (0x01<<i))) {
-                                               efuse_OneByteRead(padapter, eFuse_Addr++, &efuseData, false);
+                                               efuse_OneByteRead(padapter, eFuse_Addr++, &efuseData);
                                                efuseTbl[addr] = efuseData;
 
-                                               efuse_OneByteRead(padapter, eFuse_Addr++, &efuseData, false);
+                                               efuse_OneByteRead(padapter, eFuse_Addr++, &efuseData);
                                                efuseTbl[addr+1] = efuseData;
                                        }
                                        addr += 2;
@@ -1475,7 +1475,7 @@ void Hal_EfuseParsePackageType_8723B(
        u8 efuseContent;
 
        Efuse_PowerSwitch(padapter, false, true);
-       efuse_OneByteRead(padapter, 0x1FB, &efuseContent, false);
+       efuse_OneByteRead(padapter, 0x1FB, &efuseContent);
        Efuse_PowerSwitch(padapter, false, false);
 
        package = efuseContent & 0x7;

diff --git a/drivers/staging/rtl8723bs/include/rtw_efuse.h b/drivers/staging/rtl8723bs/include/rtw_efuse.h
index a5c338c67245a2f2b9809dd81fa9c67e5a4f4583..1cee7a8eedf2b5cb0f96483d362f317b0eaaa70e 100644 (file)
--- a/drivers/staging/rtl8723bs/include/rtw_efuse.h
+++ b/drivers/staging/rtl8723bs/include/rtw_efuse.h
@@ -91,7 +91,7 @@ extern u8 fakeBTEfuseModifiedMap[];
 /*------------------------Export global variable----------------------------*/
 
 u8 Efuse_CalculateWordCnts(u8 word_en);
-u8 efuse_OneByteRead(struct adapter *padapter, u16 addr, u8 *data, bool         bPseudoTest);
+u8 efuse_OneByteRead(struct adapter *padapter, u16 addr, u8 *data);
 u8 efuse_OneByteWrite(struct adapter *padapter, u16 addr, u8 data, bool         bPseudoTest);
 
 void Efuse_PowerSwitch(struct adapter *padapter, u8 bWrite, u8  PwrState);