From: Michael Straube <straube.linux@gmail.com>
To: gregkh@linuxfoundation.org
Cc: hdegoede@redhat.com, Larry.Finger@lwfinger.net,
linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org,
Michael Straube <straube.linux@gmail.com>
Subject: [PATCH 2/4] staging: rtl8723bs: remove bWrite from Hal_EfusePowerSwitch
Date: Sun, 24 Aug 2025 11:58:28 +0200 [thread overview]
Message-ID: <20250824095830.79233-3-straube.linux@gmail.com> (raw)
In-Reply-To: <20250824095830.79233-1-straube.linux@gmail.com>
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>
---
drivers/staging/rtl8723bs/core/rtw_efuse.c | 4 +--
.../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 25 +++----------------
drivers/staging/rtl8723bs/include/hal_intf.h | 2 +-
3 files changed, 6 insertions(+), 25 deletions(-)
diff --git a/drivers/staging/rtl8723bs/core/rtw_efuse.c b/drivers/staging/rtl8723bs/core/rtw_efuse.c
index f0c705ccdbdc..d5c53b614f61 100644
--- a/drivers/staging/rtl8723bs/core/rtw_efuse.c
+++ b/drivers/staging/rtl8723bs/core/rtw_efuse.c
@@ -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);
}
/*-----------------------------------------------------------------------------
diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
index 66ba3bcd22e4..36680ecb5897 100644
--- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
@@ -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) {
diff --git a/drivers/staging/rtl8723bs/include/hal_intf.h b/drivers/staging/rtl8723bs/include/hal_intf.h
index 4fe48cccb889..2fa2382ad5f3 100644
--- a/drivers/staging/rtl8723bs/include/hal_intf.h
+++ b/drivers/staging/rtl8723bs/include/hal_intf.h
@@ -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,
--
2.51.0
next prev parent reply other threads:[~2025-08-24 9:58 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-08-24 9:58 [PATCH 0/4] staging: rtl8723bs: more efuse cleanups Michael Straube
2025-08-24 9:58 ` [PATCH 1/4] staging: rtl8723bs: remove wrapper Efuse_PowerSwitch Michael Straube
2025-08-24 9:58 ` Michael Straube [this message]
2025-08-24 9:58 ` [PATCH 3/4] staging: rtl8723bs: remove REG_EFUSE_ACCESS_8723 and EFUSE_ACCESS_ON_8723 Michael Straube
2025-08-24 9:58 ` [PATCH 4/4] staging: rtl8723bs: Hal_EfuseParseAntennaDiversity_8723B is empty Michael Straube
2025-08-29 21:06 ` [PATCH 0/4] staging: rtl8723bs: more efuse cleanups philipp hortmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250824095830.79233-3-straube.linux@gmail.com \
--to=straube.linux@gmail.com \
--cc=Larry.Finger@lwfinger.net \
--cc=gregkh@linuxfoundation.org \
--cc=hdegoede@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.