]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
staging: rtl8723bs: remove bPseudoTest from hal_ReadEFuse_BT
authorMichael Straube <straube.linux@gmail.com>
Sat, 23 Aug 2025 12:43:14 +0000 (14:43 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 6 Sep 2025 13:54:57 +0000 (15:54 +0200)
The function hal_ReadEFuse_BT is always called with bPseudoTest set
to false. Remove the pPseudoTest parameter, replace its usage in the
function with false, 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-8-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c

index c40d447c04d20c1dab1372e0d071d6182cf3dfb6..fe6a3dd84aca41759e3e3d1964db3a702a201ab1 100644 (file)
@@ -755,14 +755,9 @@ static void hal_ReadEFuse_BT(
        struct adapter *padapter,
        u16 _offset,
        u16 _size_byte,
-       u8 *pbuf,
-       bool bPseudoTest
+       u8 *pbuf
 )
 {
-#ifdef HAL_EFUSE_MEMORY
-       struct hal_com_data *pHalData = GET_HAL_DATA(padapter);
-       struct efuse_hal *pEfuseHal = &pHalData->EfuseHal;
-#endif
        u8 *efuseTbl;
        u8 bank;
        u16 eFuse_Addr;
@@ -785,16 +780,16 @@ static void hal_ReadEFuse_BT(
        /*  0xff will be efuse default value instead of 0x00. */
        memset(efuseTbl, 0xFF, EFUSE_BT_MAP_LEN);
 
-       EFUSE_GetEfuseDefinition(padapter, EFUSE_BT, TYPE_AVAILABLE_EFUSE_BYTES_BANK, &total, bPseudoTest);
+       EFUSE_GetEfuseDefinition(padapter, EFUSE_BT, TYPE_AVAILABLE_EFUSE_BYTES_BANK, &total, false);
 
        for (bank = 1; bank < 3; bank++) { /*  8723b Max bake 0~2 */
-               if (hal_EfuseSwitchToBank(padapter, bank, bPseudoTest) == false)
+               if (hal_EfuseSwitchToBank(padapter, bank, false) == false)
                        goto exit;
 
                eFuse_Addr = 0;
 
                while (AVAILABLE_EFUSE_ADDR(eFuse_Addr)) {
-                       efuse_OneByteRead(padapter, eFuse_Addr++, &efuseHeader, bPseudoTest);
+                       efuse_OneByteRead(padapter, eFuse_Addr++, &efuseHeader, false);
                        if (efuseHeader == 0xFF)
                                break;
 
@@ -802,7 +797,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, bPseudoTest);
+                               efuse_OneByteRead(padapter, eFuse_Addr++, &efuseExtHdr, false);
                                if (ALL_WORDS_DISABLED(efuseExtHdr))
                                        continue;
 
@@ -820,10 +815,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, bPseudoTest);
+                                               efuse_OneByteRead(padapter, eFuse_Addr++, &efuseData, false);
                                                efuseTbl[addr] = efuseData;
 
-                                               efuse_OneByteRead(padapter, eFuse_Addr++, &efuseData, bPseudoTest);
+                                               efuse_OneByteRead(padapter, eFuse_Addr++, &efuseData, false);
                                                efuseTbl[addr+1] = efuseData;
                                        }
                                        addr += 2;
@@ -839,7 +834,7 @@ static void hal_ReadEFuse_BT(
        }
 
        /*  switch bank back to bank 0 for later BT and wifi use. */
-       hal_EfuseSwitchToBank(padapter, 0, bPseudoTest);
+       hal_EfuseSwitchToBank(padapter, 0, false);
 
        /*  Copy from Efuse map to output pointer memory!!! */
        for (i = 0; i < _size_byte; i++)
@@ -848,19 +843,12 @@ static void hal_ReadEFuse_BT(
        /*  */
        /*  Calculate Efuse utilization. */
        /*  */
-       EFUSE_GetEfuseDefinition(padapter, EFUSE_BT, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, &total, bPseudoTest);
+       EFUSE_GetEfuseDefinition(padapter, EFUSE_BT, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, &total, false);
        used = (EFUSE_BT_REAL_BANK_CONTENT_LEN*(bank-1)) + eFuse_Addr - 1;
        efuse_usage = (u8)((used*100)/total);
-       if (bPseudoTest) {
-#ifdef HAL_EFUSE_MEMORY
-               pEfuseHal->fakeBTEfuseUsedBytes = used;
-#else
-               fakeBTEfuseUsedBytes = used;
-#endif
-       } else {
-               rtw_hal_set_hwreg(padapter, HW_VAR_EFUSE_BT_BYTES, (u8 *)&used);
-               rtw_hal_set_hwreg(padapter, HW_VAR_EFUSE_BT_USAGE, (u8 *)&efuse_usage);
-       }
+
+       rtw_hal_set_hwreg(padapter, HW_VAR_EFUSE_BT_BYTES, (u8 *)&used);
+       rtw_hal_set_hwreg(padapter, HW_VAR_EFUSE_BT_USAGE, (u8 *)&efuse_usage);
 
 exit:
        kfree(efuseTbl);
@@ -877,7 +865,7 @@ void Hal_ReadEFuse(
        if (efuseType == EFUSE_WIFI)
                hal_ReadEFuse_WiFi(padapter, _offset, _size_byte, pbuf);
        else
-               hal_ReadEFuse_BT(padapter, _offset, _size_byte, pbuf, false);
+               hal_ReadEFuse_BT(padapter, _offset, _size_byte, pbuf);
 }
 
 static u16 hal_EfuseGetCurrentSize_WiFi(