]> www.infradead.org Git - users/hch/misc.git/commitdiff
staging: rtl8723bs: remove bPseudoTest from hal_ReadEFuse_WiFi
authorMichael Straube <straube.linux@gmail.com>
Sat, 23 Aug 2025 12:43:13 +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_WiFi 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-7-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c

index 002648a8fd8134300fa3daff71f2b1878e6ee961..c40d447c04d20c1dab1372e0d071d6182cf3dfb6 100644 (file)
@@ -669,14 +669,9 @@ static void hal_ReadEFuse_WiFi(
        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 = NULL;
        u16 eFuse_Addr = 0;
        u8 offset, wden;
@@ -698,10 +693,10 @@ static void hal_ReadEFuse_WiFi(
        memset(efuseTbl, 0xFF, EFUSE_MAX_MAP_LEN);
 
        /*  switch bank back to bank 0 for later BT and wifi use. */
-       hal_EfuseSwitchToBank(padapter, 0, bPseudoTest);
+       hal_EfuseSwitchToBank(padapter, 0, false);
 
        while (AVAILABLE_EFUSE_ADDR(eFuse_Addr)) {
-               efuse_OneByteRead(padapter, eFuse_Addr++, &efuseHeader, bPseudoTest);
+               efuse_OneByteRead(padapter, eFuse_Addr++, &efuseHeader, false);
                if (efuseHeader == 0xFF)
                        break;
 
@@ -709,7 +704,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, bPseudoTest);
+                       efuse_OneByteRead(padapter, eFuse_Addr++, &efuseExtHdr, false);
                        if (ALL_WORDS_DISABLED(efuseExtHdr))
                                continue;
 
@@ -728,10 +723,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, 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;
@@ -746,19 +741,12 @@ static void hal_ReadEFuse_WiFi(
                pbuf[i] = efuseTbl[_offset+i];
 
        /*  Calculate Efuse utilization */
-       EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, &total, bPseudoTest);
+       EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, &total, false);
        used = eFuse_Addr - 1;
        efuse_usage = (u8)((used*100)/total);
-       if (bPseudoTest) {
-#ifdef HAL_EFUSE_MEMORY
-               pEfuseHal->fakeEfuseUsedBytes = used;
-#else
-               fakeEfuseUsedBytes = used;
-#endif
-       } else {
-               rtw_hal_set_hwreg(padapter, HW_VAR_EFUSE_BYTES, (u8 *)&used);
-               rtw_hal_set_hwreg(padapter, HW_VAR_EFUSE_USAGE, (u8 *)&efuse_usage);
-       }
+
+       rtw_hal_set_hwreg(padapter, HW_VAR_EFUSE_BYTES, (u8 *)&used);
+       rtw_hal_set_hwreg(padapter, HW_VAR_EFUSE_USAGE, (u8 *)&efuse_usage);
 
        kfree(efuseTbl);
 }
@@ -887,7 +875,7 @@ void Hal_ReadEFuse(
 )
 {
        if (efuseType == EFUSE_WIFI)
-               hal_ReadEFuse_WiFi(padapter, _offset, _size_byte, pbuf, false);
+               hal_ReadEFuse_WiFi(padapter, _offset, _size_byte, pbuf);
        else
                hal_ReadEFuse_BT(padapter, _offset, _size_byte, pbuf, false);
 }