]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
staging: rtl8723bs: remove bWrite from Hal_EfusePowerSwitch
authorMichael Straube <straube.linux@gmail.com>
Sun, 24 Aug 2025 09:58:28 +0000 (11:58 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 6 Sep 2025 13:55:48 +0000 (15:55 +0200)
The function Hal_EfusePowerSwitch is always called with bWrite set to
false. Remove the pWrite parameter and reomve resulting dead code to reduce
code complexity.

Signed-off-by: Michael Straube <straube.linux@gmail.com>
Tested-by: Philipp Hortmann <philipp.g.hortmann@gmail.com> # Trendbook Next 14
Link: https://lore.kernel.org/r/20250824095830.79233-3-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8723bs/core/rtw_efuse.c
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
drivers/staging/rtl8723bs/include/hal_intf.h

index f0c705ccdbdc46b63d66254f92583df9826c4a4a..d5c53b614f616d6893b9aa708e6a00021bcf4ded 100644 (file)
@@ -164,13 +164,13 @@ static void Efuse_ReadAllMap(struct adapter *padapter, u8 efuseType, u8 *Efuse)
 {
        u16 mapLen = 0;
 
-       Hal_EfusePowerSwitch(padapter, false, true);
+       Hal_EfusePowerSwitch(padapter, true);
 
        Hal_GetEfuseDefinition(padapter, efuseType, TYPE_EFUSE_MAP_LEN, (void *)&mapLen);
 
        Hal_ReadEFuse(padapter, efuseType, 0, mapLen, Efuse);
 
-       Hal_EfusePowerSwitch(padapter, false, false);
+       Hal_EfusePowerSwitch(padapter, false);
 }
 
 /*-----------------------------------------------------------------------------
index 66ba3bcd22e4c9957f150be2e29e43709c8a7bcd..36680ecb5897423bf9a7d5871719575db20576c6 100644 (file)
@@ -568,8 +568,6 @@ void Hal_GetEfuseDefinition(
        }
 }
 
-#define VOLTAGE_V25            0x03
-
 /*  */
 /*     The following is for compile ok */
 /*     That should be merged with the original in the future */
@@ -578,7 +576,7 @@ void Hal_GetEfuseDefinition(
 #define REG_EFUSE_ACCESS_8723                  0x00CF  /*  Efuse access protection for RTL8723 */
 
 void Hal_EfusePowerSwitch(
-       struct adapter *padapter, u8 bWrite, u8 PwrState
+       struct adapter *padapter, u8 PwrState
 )
 {
        u8 tempval;
@@ -626,25 +624,8 @@ void Hal_EfusePowerSwitch(
                        tmpV16 |= (LOADER_CLK_EN | ANA8M);
                        rtw_write16(padapter, REG_SYS_CLKR, tmpV16);
                }
-
-               if (bWrite) {
-                       /*  Enable LDO 2.5V before read/write action */
-                       tempval = rtw_read8(padapter, EFUSE_TEST+3);
-                       tempval &= 0x0F;
-                       tempval |= (VOLTAGE_V25 << 4);
-                       rtw_write8(padapter, EFUSE_TEST+3, (tempval | 0x80));
-
-                       /* rtw_write8(padapter, REG_EFUSE_ACCESS, EFUSE_ACCESS_ON); */
-               }
        } else {
                rtw_write8(padapter, REG_EFUSE_ACCESS, EFUSE_ACCESS_OFF);
-
-               if (bWrite) {
-                       /*  Disable LDO 2.5V after read/write action */
-                       tempval = rtw_read8(padapter, EFUSE_TEST+3);
-                       rtw_write8(padapter, EFUSE_TEST+3, (tempval & 0x7F));
-               }
-
        }
 }
 
@@ -1474,9 +1455,9 @@ void Hal_EfuseParsePackageType_8723B(
        u8 package;
        u8 efuseContent;
 
-       Hal_EfusePowerSwitch(padapter, false, true);
+       Hal_EfusePowerSwitch(padapter, true);
        efuse_OneByteRead(padapter, 0x1FB, &efuseContent);
-       Hal_EfusePowerSwitch(padapter, false, false);
+       Hal_EfusePowerSwitch(padapter, false);
 
        package = efuseContent & 0x7;
        switch (package) {
index 4fe48cccb8898c7f79affa130e5a0d7febc21d58..2fa2382ad5f37413046071efdb2f5885de04c2aa 100644 (file)
@@ -265,7 +265,7 @@ u8 GetHalDefVar8723BSDIO(struct adapter *Adapter, enum hal_def_variable eVariabl
 u8 SetHalDefVar8723BSDIO(struct adapter *Adapter, enum hal_def_variable eVariable, void *pValue);
 void UpdateHalRAMask8723B(struct adapter *padapter, u32 mac_id, u8 rssi_level);
 void rtl8723b_SetBeaconRelatedRegisters(struct adapter *padapter);
-void Hal_EfusePowerSwitch(struct adapter *padapter, u8 bWrite, u8 PwrState);
+void Hal_EfusePowerSwitch(struct adapter *padapter, u8 PwrState);
 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,