]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
staging: rtl8723bs: remove Hal_EfuseGetCurrentSize
authorMichael Straube <straube.linux@gmail.com>
Sat, 23 Aug 2025 12:43:17 +0000 (14:43 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 6 Sep 2025 13:54:57 +0000 (15:54 +0200)
The function Hal_EfuseGetCurrentSize is not used in the driver code,
remove it to get rid of dead code. As Hal_EfuseGetCurrentSize is the only
caller of hal_EfuseGetCurrentSize_WiFi and hal_EfuseGetCurrentSize_BT we
can remove these two functions as well.

Signed-off-by: Michael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20250823124321.485910-11-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
drivers/staging/rtl8723bs/include/hal_intf.h

index af61730cff1464d237aba8d274bad118361d6a22..0679f77e3498846fddbf9ba4c346bcea1f2ae1d2 100644 (file)
@@ -867,190 +867,6 @@ void Hal_ReadEFuse(
                hal_ReadEFuse_BT(padapter, _offset, _size_byte, pbuf);
 }
 
-static u16 hal_EfuseGetCurrentSize_WiFi(
-       struct adapter *padapter, bool bPseudoTest
-)
-{
-#ifdef HAL_EFUSE_MEMORY
-       struct hal_com_data *pHalData = GET_HAL_DATA(padapter);
-       struct efuse_hal *pEfuseHal = &pHalData->EfuseHal;
-#endif
-       u16 efuse_addr = 0;
-       u16 start_addr = 0; /*  for debug */
-       u8 hworden = 0;
-       u8 efuse_data, word_cnts = 0;
-       u32 count = 0; /*  for debug */
-
-
-       if (bPseudoTest) {
-#ifdef HAL_EFUSE_MEMORY
-               efuse_addr = (u16)pEfuseHal->fakeEfuseUsedBytes;
-#else
-               efuse_addr = (u16)fakeEfuseUsedBytes;
-#endif
-       } else
-               rtw_hal_get_hwreg(padapter, HW_VAR_EFUSE_BYTES, (u8 *)&efuse_addr);
-
-       start_addr = efuse_addr;
-
-       /*  switch bank back to bank 0 for later BT and wifi use. */
-       hal_EfuseSwitchToBank(padapter, 0, bPseudoTest);
-
-       count = 0;
-       while (AVAILABLE_EFUSE_ADDR(efuse_addr)) {
-               if (efuse_OneByteRead(padapter, efuse_addr, &efuse_data, bPseudoTest) == false)
-                       goto error;
-
-               if (efuse_data == 0xFF)
-                       break;
-
-               if ((start_addr != 0) && (efuse_addr == start_addr)) {
-                       count++;
-
-                       efuse_data = 0xFF;
-                       if (count < 4) {
-                               /*  try again! */
-
-                               if (count > 2) {
-                                       /*  try again form address 0 */
-                                       efuse_addr = 0;
-                                       start_addr = 0;
-                               }
-
-                               continue;
-                       }
-
-                       goto error;
-               }
-
-               if (EXT_HEADER(efuse_data)) {
-                       efuse_addr++;
-                       efuse_OneByteRead(padapter, efuse_addr, &efuse_data, bPseudoTest);
-                       if (ALL_WORDS_DISABLED(efuse_data))
-                               continue;
-
-                       hworden = efuse_data & 0x0F;
-               } else {
-                       hworden = efuse_data & 0x0F;
-               }
-
-               word_cnts = Efuse_CalculateWordCnts(hworden);
-               efuse_addr += (word_cnts*2)+1;
-       }
-
-       if (bPseudoTest) {
-#ifdef HAL_EFUSE_MEMORY
-               pEfuseHal->fakeEfuseUsedBytes = efuse_addr;
-#else
-               fakeEfuseUsedBytes = efuse_addr;
-#endif
-       } else
-               rtw_hal_set_hwreg(padapter, HW_VAR_EFUSE_BYTES, (u8 *)&efuse_addr);
-
-       goto exit;
-
-error:
-       /*  report max size to prevent write efuse */
-       Hal_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, &efuse_addr);
-
-exit:
-
-       return efuse_addr;
-}
-
-static u16 hal_EfuseGetCurrentSize_BT(struct adapter *padapter, u8 bPseudoTest)
-{
-#ifdef HAL_EFUSE_MEMORY
-       struct hal_com_data *pHalData = GET_HAL_DATA(padapter);
-       struct efuse_hal *pEfuseHal = &pHalData->EfuseHal;
-#endif
-       u16 btusedbytes;
-       u16 efuse_addr;
-       u8 bank, startBank;
-       u8 hworden = 0;
-       u8 efuse_data, word_cnts = 0;
-       u16 retU2 = 0;
-
-       if (bPseudoTest) {
-#ifdef HAL_EFUSE_MEMORY
-               btusedbytes = pEfuseHal->fakeBTEfuseUsedBytes;
-#else
-               btusedbytes = fakeBTEfuseUsedBytes;
-#endif
-       } else
-               rtw_hal_get_hwreg(padapter, HW_VAR_EFUSE_BT_BYTES, (u8 *)&btusedbytes);
-
-       efuse_addr = (u16)((btusedbytes%EFUSE_BT_REAL_BANK_CONTENT_LEN));
-       startBank = (u8)(1+(btusedbytes/EFUSE_BT_REAL_BANK_CONTENT_LEN));
-
-       Hal_GetEfuseDefinition(padapter, EFUSE_BT, TYPE_AVAILABLE_EFUSE_BYTES_BANK, &retU2);
-
-       for (bank = startBank; bank < 3; bank++) {
-               if (hal_EfuseSwitchToBank(padapter, bank, bPseudoTest) == false)
-                       /* bank = EFUSE_MAX_BANK; */
-                       break;
-
-               /*  only when bank is switched we have to reset the efuse_addr. */
-               if (bank != startBank)
-                       efuse_addr = 0;
-
-               while (AVAILABLE_EFUSE_ADDR(efuse_addr)) {
-                       if (efuse_OneByteRead(padapter, efuse_addr,
-                                             &efuse_data, bPseudoTest) == false)
-                               /* bank = EFUSE_MAX_BANK; */
-                               break;
-
-                       if (efuse_data == 0xFF)
-                               break;
-
-                       if (EXT_HEADER(efuse_data)) {
-                               efuse_addr++;
-                               efuse_OneByteRead(padapter, efuse_addr, &efuse_data, bPseudoTest);
-
-                               if (ALL_WORDS_DISABLED(efuse_data)) {
-                                       efuse_addr++;
-                                       continue;
-                               }
-
-                               hworden = efuse_data & 0x0F;
-                       } else {
-                               hworden =  efuse_data & 0x0F;
-                       }
-
-                       word_cnts = Efuse_CalculateWordCnts(hworden);
-                       /* read next header */
-                       efuse_addr += (word_cnts*2)+1;
-               }
-
-               /*  Check if we need to check next bank efuse */
-               if (efuse_addr < retU2)
-                       break; /*  don't need to check next bank. */
-       }
-
-       retU2 = ((bank-1)*EFUSE_BT_REAL_BANK_CONTENT_LEN)+efuse_addr;
-       if (bPseudoTest) {
-               pEfuseHal->fakeBTEfuseUsedBytes = retU2;
-       } else {
-               pEfuseHal->BTEfuseUsedBytes = retU2;
-       }
-
-       return retU2;
-}
-
-u16 Hal_EfuseGetCurrentSize(
-       struct adapter *padapter, u8 efuseType, bool bPseudoTest
-)
-{
-       u16 ret = 0;
-
-       if (efuseType == EFUSE_WIFI)
-               ret = hal_EfuseGetCurrentSize_WiFi(padapter, bPseudoTest);
-       else
-               ret = hal_EfuseGetCurrentSize_BT(padapter, bPseudoTest);
-
-       return ret;
-}
-
 static struct hal_version ReadChipVersion8723B(struct adapter *padapter)
 {
        u32 value32;
index fbf0b01780ea781dea1222057bd5803a74362b20..4fe48cccb8898c7f79affa130e5a0d7febc21d58 100644 (file)
@@ -270,6 +270,5 @@ void Hal_ReadEFuse(struct adapter *padapter, u8 efuseType, u16 _offset,
                   u16 _size_byte, u8 *pbuf);
 void Hal_GetEfuseDefinition(struct adapter *padapter, u8 efuseType, u8 type,
                            void *pOut);
-u16 Hal_EfuseGetCurrentSize(struct adapter *padapter, u8 efuseType, bool bPseudoTest);
 void hal_notch_filter_8723b(struct adapter *adapter, bool enable);
 #endif /* __HAL_INTF_H__ */