* [PATCH 00/16] staging: rtl8723bs: Replace function pointers starting with EFUSEGetEfuseDefinition
@ 2024-11-06 18:33 Philipp Hortmann
2024-11-06 18:33 ` [PATCH 01/16] staging: rtl8723bs: Remove function pointer EFUSEGetEfuseDefinition Philipp Hortmann
` (15 more replies)
0 siblings, 16 replies; 17+ messages in thread
From: Philipp Hortmann @ 2024-11-06 18:33 UTC (permalink / raw)
To: Greg Kroah-Hartman, linux-staging, linux-kernel; +Cc: Philipp Hortmann
Replace function pointers with functions to increase readability.
Remove unused functions.
Tested with rtl8723bs in ODYS Trendbook Next 14
Philipp Hortmann (16):
staging: rtl8723bs: Remove function pointer EFUSEGetEfuseDefinition
staging: rtl8723bs: Remove function pointer EfuseGetCurrentSize
staging: rtl8723bs: Remove unused function Efuse_PgPacketRead
staging: rtl8723bs: Remove unused function Hal_EfusePgPacketRead
staging: rtl8723bs: Remove unused function Efuse_PgPacketWrite
staging: rtl8723bs: Remove unused function Hal_EfusePgPacketWrite
staging: rtl8723bs: Remove unused function Hal_EfusePgPacketWrite_BT
staging: rtl8723bs: Remove unused function hal_EfusePgPacketWriteData
staging: rtl8723bs: Remove unused function
hal_EfusePgPacketWriteHeader
staging: rtl8723bs: Remove unused function hal_EfusePartialWriteCheck
staging: rtl8723bs: Remove unused function hal_EfuseConstructPGPkt
staging: rtl8723bs: Remove unused function
hal_EfusePgCheckAvailableAddr
staging: rtl8723bs: Remove function hal_EfusePgPacketWrite2ByteHeader
staging: rtl8723bs: Remove function hal_EfusePgPacketWrite1ByteHeader
staging: rtl8723bs: Remove unused function efuse_WordEnableDataRead
staging: rtl8723bs: Remove unused function Efuse_GetCurrentSize
drivers/staging/rtl8723bs/core/rtw_efuse.c | 90 +----
.../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 353 +-----------------
drivers/staging/rtl8723bs/include/hal_intf.h | 8 +-
drivers/staging/rtl8723bs/include/rtw_efuse.h | 4 -
4 files changed, 6 insertions(+), 449 deletions(-)
--
2.43.0
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 01/16] staging: rtl8723bs: Remove function pointer EFUSEGetEfuseDefinition
2024-11-06 18:33 [PATCH 00/16] staging: rtl8723bs: Replace function pointers starting with EFUSEGetEfuseDefinition Philipp Hortmann
@ 2024-11-06 18:33 ` Philipp Hortmann
2024-11-06 18:33 ` [PATCH 02/16] staging: rtl8723bs: Remove function pointer EfuseGetCurrentSize Philipp Hortmann
` (14 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: Philipp Hortmann @ 2024-11-06 18:33 UTC (permalink / raw)
To: Greg Kroah-Hartman, linux-staging, linux-kernel; +Cc: Philipp Hortmann
Remove function pointer EFUSEGetEfuseDefinition and use
Hal_GetEfuseDefinition directly to increase readability.
Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
---
drivers/staging/rtl8723bs/core/rtw_efuse.c | 2 +-
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 3 +--
drivers/staging/rtl8723bs/include/hal_intf.h | 3 ++-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/rtl8723bs/core/rtw_efuse.c b/drivers/staging/rtl8723bs/core/rtw_efuse.c
index b6c655e6747e..b8023e9d7631 100644
--- a/drivers/staging/rtl8723bs/core/rtw_efuse.c
+++ b/drivers/staging/rtl8723bs/core/rtw_efuse.c
@@ -171,7 +171,7 @@ EFUSE_GetEfuseDefinition(
bool bPseudoTest
)
{
- padapter->HalFunc.EFUSEGetEfuseDefinition(padapter, efuseType, type, pOut, bPseudoTest);
+ Hal_GetEfuseDefinition(padapter, efuseType, type, pOut, bPseudoTest);
}
/*-----------------------------------------------------------------------------
diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
index 2d2de56d5df7..8a4ebe645786 100644
--- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
@@ -490,7 +490,7 @@ static u8 hal_EfuseSwitchToBank(
return bRet;
}
-static void Hal_GetEfuseDefinition(
+void Hal_GetEfuseDefinition(
struct adapter *padapter,
u8 efuseType,
u8 type,
@@ -1745,7 +1745,6 @@ void UpdateHalRAMask8723B(struct adapter *padapter, u32 mac_id, u8 rssi_level)
void rtl8723b_set_hal_ops(struct hal_ops *pHalFunc)
{
/* Efuse related function */
- pHalFunc->EFUSEGetEfuseDefinition = &Hal_GetEfuseDefinition;
pHalFunc->EfuseGetCurrentSize = &Hal_EfuseGetCurrentSize;
pHalFunc->Efuse_PgPacketRead = &Hal_EfusePgPacketRead;
pHalFunc->Efuse_PgPacketWrite = &Hal_EfusePgPacketWrite;
diff --git a/drivers/staging/rtl8723bs/include/hal_intf.h b/drivers/staging/rtl8723bs/include/hal_intf.h
index 2285e82ab7b2..a513721e763b 100644
--- a/drivers/staging/rtl8723bs/include/hal_intf.h
+++ b/drivers/staging/rtl8723bs/include/hal_intf.h
@@ -164,7 +164,6 @@ typedef s32 (*c2h_id_filter)(u8 *c2h_evt);
struct hal_ops {
void (*SetHalODMVarHandler)(struct adapter *padapter, enum hal_odm_variable eVariable, void *pValue1, bool bSet);
- void (*EFUSEGetEfuseDefinition)(struct adapter *padapter, u8 efuseType, u8 type, void *pOut, bool bPseudoTest);
u16 (*EfuseGetCurrentSize)(struct adapter *padapter, u8 efuseType, bool bPseudoTest);
int (*Efuse_PgPacketRead)(struct adapter *padapter, u8 offset, u8 *data, bool bPseudoTest);
int (*Efuse_PgPacketWrite)(struct adapter *padapter, u8 offset, u8 word_en, u8 *data, bool bPseudoTest);
@@ -290,4 +289,6 @@ void rtl8723b_SetBeaconRelatedRegisters(struct adapter *padapter);
void Hal_EfusePowerSwitch(struct adapter *padapter, u8 bWrite, u8 PwrState);
void Hal_ReadEFuse(struct adapter *padapter, u8 efuseType, u16 _offset,
u16 _size_byte, u8 *pbuf, bool bPseudoTest);
+void Hal_GetEfuseDefinition(struct adapter *padapter, u8 efuseType, u8 type,
+ void *pOut, bool bPseudoTest);
#endif /* __HAL_INTF_H__ */
--
2.43.0
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 02/16] staging: rtl8723bs: Remove function pointer EfuseGetCurrentSize
2024-11-06 18:33 [PATCH 00/16] staging: rtl8723bs: Replace function pointers starting with EFUSEGetEfuseDefinition Philipp Hortmann
2024-11-06 18:33 ` [PATCH 01/16] staging: rtl8723bs: Remove function pointer EFUSEGetEfuseDefinition Philipp Hortmann
@ 2024-11-06 18:33 ` Philipp Hortmann
2024-11-06 18:33 ` [PATCH 03/16] staging: rtl8723bs: Remove unused function Efuse_PgPacketRead Philipp Hortmann
` (13 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: Philipp Hortmann @ 2024-11-06 18:33 UTC (permalink / raw)
To: Greg Kroah-Hartman, linux-staging, linux-kernel; +Cc: Philipp Hortmann
Remove function pointer EfuseGetCurrentSize and use
Hal_EfuseGetCurrentSize directly to increase readability.
Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
---
drivers/staging/rtl8723bs/core/rtw_efuse.c | 3 +--
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 3 +--
drivers/staging/rtl8723bs/include/hal_intf.h | 2 +-
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/rtl8723bs/core/rtw_efuse.c b/drivers/staging/rtl8723bs/core/rtw_efuse.c
index b8023e9d7631..8e6c294c168e 100644
--- a/drivers/staging/rtl8723bs/core/rtw_efuse.c
+++ b/drivers/staging/rtl8723bs/core/rtw_efuse.c
@@ -102,8 +102,7 @@ Efuse_GetCurrentSize(
u8 efuseType,
bool bPseudoTest)
{
- return padapter->HalFunc.EfuseGetCurrentSize(padapter, efuseType,
- bPseudoTest);
+ return Hal_EfuseGetCurrentSize(padapter, efuseType, bPseudoTest);
}
/* 11/16/2008 MH Add description. Get current efuse area enabled word!!. */
diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
index 8a4ebe645786..11969a90a5e5 100644
--- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
@@ -1072,7 +1072,7 @@ static u16 hal_EfuseGetCurrentSize_BT(struct adapter *padapter, u8 bPseudoTest)
return retU2;
}
-static u16 Hal_EfuseGetCurrentSize(
+u16 Hal_EfuseGetCurrentSize(
struct adapter *padapter, u8 efuseType, bool bPseudoTest
)
{
@@ -1745,7 +1745,6 @@ void UpdateHalRAMask8723B(struct adapter *padapter, u32 mac_id, u8 rssi_level)
void rtl8723b_set_hal_ops(struct hal_ops *pHalFunc)
{
/* Efuse related function */
- pHalFunc->EfuseGetCurrentSize = &Hal_EfuseGetCurrentSize;
pHalFunc->Efuse_PgPacketRead = &Hal_EfusePgPacketRead;
pHalFunc->Efuse_PgPacketWrite = &Hal_EfusePgPacketWrite;
pHalFunc->Efuse_WordEnableDataWrite = &Hal_EfuseWordEnableDataWrite;
diff --git a/drivers/staging/rtl8723bs/include/hal_intf.h b/drivers/staging/rtl8723bs/include/hal_intf.h
index a513721e763b..48305cbf9929 100644
--- a/drivers/staging/rtl8723bs/include/hal_intf.h
+++ b/drivers/staging/rtl8723bs/include/hal_intf.h
@@ -164,7 +164,6 @@ typedef s32 (*c2h_id_filter)(u8 *c2h_evt);
struct hal_ops {
void (*SetHalODMVarHandler)(struct adapter *padapter, enum hal_odm_variable eVariable, void *pValue1, bool bSet);
- u16 (*EfuseGetCurrentSize)(struct adapter *padapter, u8 efuseType, bool bPseudoTest);
int (*Efuse_PgPacketRead)(struct adapter *padapter, u8 offset, u8 *data, bool bPseudoTest);
int (*Efuse_PgPacketWrite)(struct adapter *padapter, u8 offset, u8 word_en, u8 *data, bool bPseudoTest);
u8 (*Efuse_WordEnableDataWrite)(struct adapter *padapter, u16 efuse_addr, u8 word_en, u8 *data, bool bPseudoTest);
@@ -291,4 +290,5 @@ void Hal_ReadEFuse(struct adapter *padapter, u8 efuseType, u16 _offset,
u16 _size_byte, u8 *pbuf, bool bPseudoTest);
void Hal_GetEfuseDefinition(struct adapter *padapter, u8 efuseType, u8 type,
void *pOut, bool bPseudoTest);
+u16 Hal_EfuseGetCurrentSize(struct adapter *padapter, u8 efuseType, bool bPseudoTest);
#endif /* __HAL_INTF_H__ */
--
2.43.0
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 03/16] staging: rtl8723bs: Remove unused function Efuse_PgPacketRead
2024-11-06 18:33 [PATCH 00/16] staging: rtl8723bs: Replace function pointers starting with EFUSEGetEfuseDefinition Philipp Hortmann
2024-11-06 18:33 ` [PATCH 01/16] staging: rtl8723bs: Remove function pointer EFUSEGetEfuseDefinition Philipp Hortmann
2024-11-06 18:33 ` [PATCH 02/16] staging: rtl8723bs: Remove function pointer EfuseGetCurrentSize Philipp Hortmann
@ 2024-11-06 18:33 ` Philipp Hortmann
2024-11-06 18:33 ` [PATCH 04/16] staging: rtl8723bs: Remove unused function Hal_EfusePgPacketRead Philipp Hortmann
` (12 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: Philipp Hortmann @ 2024-11-06 18:33 UTC (permalink / raw)
To: Greg Kroah-Hartman, linux-staging, linux-kernel; +Cc: Philipp Hortmann
Remove unused function Efuse_PgPacketRead.
Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
---
drivers/staging/rtl8723bs/core/rtw_efuse.c | 10 ----------
drivers/staging/rtl8723bs/include/rtw_efuse.h | 1 -
2 files changed, 11 deletions(-)
diff --git a/drivers/staging/rtl8723bs/core/rtw_efuse.c b/drivers/staging/rtl8723bs/core/rtw_efuse.c
index 8e6c294c168e..e83daeb9303d 100644
--- a/drivers/staging/rtl8723bs/core/rtw_efuse.c
+++ b/drivers/staging/rtl8723bs/core/rtw_efuse.c
@@ -311,16 +311,6 @@ u8 efuse_OneByteWrite(struct adapter *padapter, u16 addr, u8 data, bool bPseudoT
return bResult;
}
-int
-Efuse_PgPacketRead(struct adapter *padapter,
- u8 offset,
- u8 *data,
- bool bPseudoTest)
-{
- return padapter->HalFunc.Efuse_PgPacketRead(padapter, offset, data,
- bPseudoTest);
-}
-
int
Efuse_PgPacketWrite(struct adapter *padapter,
u8 offset,
diff --git a/drivers/staging/rtl8723bs/include/rtw_efuse.h b/drivers/staging/rtl8723bs/include/rtw_efuse.h
index 0cb8c6f6d34d..de4e5906ceb5 100644
--- a/drivers/staging/rtl8723bs/include/rtw_efuse.h
+++ b/drivers/staging/rtl8723bs/include/rtw_efuse.h
@@ -97,7 +97,6 @@ u8 efuse_OneByteRead(struct adapter *padapter, u16 addr, u8 *data, bool bPseudo
u8 efuse_OneByteWrite(struct adapter *padapter, u16 addr, u8 data, bool bPseudoTest);
void Efuse_PowerSwitch(struct adapter *padapter, u8 bWrite, u8 PwrState);
-int Efuse_PgPacketRead(struct adapter *padapter, u8 offset, u8 *data, bool bPseudoTest);
int Efuse_PgPacketWrite(struct adapter *padapter, u8 offset, u8 word_en, u8 *data, bool bPseudoTest);
void efuse_WordEnableDataRead(u8 word_en, u8 *sourdata, u8 *targetdata);
u8 Efuse_WordEnableDataWrite(struct adapter *padapter, u16 efuse_addr, u8 word_en, u8 *data, bool bPseudoTest);
--
2.43.0
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 04/16] staging: rtl8723bs: Remove unused function Hal_EfusePgPacketRead
2024-11-06 18:33 [PATCH 00/16] staging: rtl8723bs: Replace function pointers starting with EFUSEGetEfuseDefinition Philipp Hortmann
` (2 preceding siblings ...)
2024-11-06 18:33 ` [PATCH 03/16] staging: rtl8723bs: Remove unused function Efuse_PgPacketRead Philipp Hortmann
@ 2024-11-06 18:33 ` Philipp Hortmann
2024-11-06 18:33 ` [PATCH 05/16] staging: rtl8723bs: Remove unused function Efuse_PgPacketWrite Philipp Hortmann
` (11 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: Philipp Hortmann @ 2024-11-06 18:33 UTC (permalink / raw)
To: Greg Kroah-Hartman, linux-staging, linux-kernel; +Cc: Philipp Hortmann
Remove unused function pointer Efuse_PgPacketRead and unused function
Hal_EfusePgPacketRead.
Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
---
.../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 73 -------------------
drivers/staging/rtl8723bs/include/hal_intf.h | 1 -
2 files changed, 74 deletions(-)
diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
index 11969a90a5e5..13fe77f84cc9 100644
--- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
@@ -1151,78 +1151,6 @@ static u8 Hal_EfuseWordEnableDataWrite(
return badworden;
}
-static s32 Hal_EfusePgPacketRead(
- struct adapter *padapter,
- u8 offset,
- u8 *data,
- bool bPseudoTest
-)
-{
- u8 efuse_data, word_cnts = 0;
- u16 efuse_addr = 0;
- u8 hoffset = 0, hworden = 0;
- u8 i;
- u8 max_section = 0;
- s32 ret;
-
-
- if (!data)
- return false;
-
- EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_EFUSE_MAX_SECTION, &max_section, bPseudoTest);
- if (offset > max_section)
- return false;
-
- memset(data, 0xFF, PGPKT_DATA_SIZE);
- ret = true;
-
- /* */
- /* <Roger_TODO> Efuse has been pre-programmed dummy 5Bytes at the end of Efuse by CP. */
- /* Skip dummy parts to prevent unexpected data read from Efuse. */
- /* By pass right now. 2009.02.19. */
- /* */
- while (AVAILABLE_EFUSE_ADDR(efuse_addr)) {
- if (efuse_OneByteRead(padapter, efuse_addr++, &efuse_data, bPseudoTest) == false) {
- ret = false;
- break;
- }
-
- if (efuse_data == 0xFF)
- break;
-
- if (EXT_HEADER(efuse_data)) {
- hoffset = GET_HDR_OFFSET_2_0(efuse_data);
- efuse_OneByteRead(padapter, efuse_addr++, &efuse_data, bPseudoTest);
- if (ALL_WORDS_DISABLED(efuse_data))
- continue;
-
- hoffset |= ((efuse_data & 0xF0) >> 1);
- hworden = efuse_data & 0x0F;
- } else {
- hoffset = (efuse_data>>4) & 0x0F;
- hworden = efuse_data & 0x0F;
- }
-
- if (hoffset == offset) {
- for (i = 0; i < EFUSE_MAX_WORD_UNIT; i++) {
- /* Check word enable condition in the section */
- if (!(hworden & (0x01<<i))) {
- efuse_OneByteRead(padapter, efuse_addr++, &efuse_data, bPseudoTest);
- data[i*2] = efuse_data;
-
- efuse_OneByteRead(padapter, efuse_addr++, &efuse_data, bPseudoTest);
- data[(i*2)+1] = efuse_data;
- }
- }
- } else {
- word_cnts = Efuse_CalculateWordCnts(hworden);
- efuse_addr += word_cnts*2;
- }
- }
-
- return ret;
-}
-
static u8 hal_EfusePgCheckAvailableAddr(
struct adapter *padapter, u8 efuseType, u8 bPseudoTest
)
@@ -1745,7 +1673,6 @@ void UpdateHalRAMask8723B(struct adapter *padapter, u32 mac_id, u8 rssi_level)
void rtl8723b_set_hal_ops(struct hal_ops *pHalFunc)
{
/* Efuse related function */
- pHalFunc->Efuse_PgPacketRead = &Hal_EfusePgPacketRead;
pHalFunc->Efuse_PgPacketWrite = &Hal_EfusePgPacketWrite;
pHalFunc->Efuse_WordEnableDataWrite = &Hal_EfuseWordEnableDataWrite;
pHalFunc->Efuse_PgPacketWrite_BT = &Hal_EfusePgPacketWrite_BT;
diff --git a/drivers/staging/rtl8723bs/include/hal_intf.h b/drivers/staging/rtl8723bs/include/hal_intf.h
index 48305cbf9929..c320795f3fd4 100644
--- a/drivers/staging/rtl8723bs/include/hal_intf.h
+++ b/drivers/staging/rtl8723bs/include/hal_intf.h
@@ -164,7 +164,6 @@ typedef s32 (*c2h_id_filter)(u8 *c2h_evt);
struct hal_ops {
void (*SetHalODMVarHandler)(struct adapter *padapter, enum hal_odm_variable eVariable, void *pValue1, bool bSet);
- int (*Efuse_PgPacketRead)(struct adapter *padapter, u8 offset, u8 *data, bool bPseudoTest);
int (*Efuse_PgPacketWrite)(struct adapter *padapter, u8 offset, u8 word_en, u8 *data, bool bPseudoTest);
u8 (*Efuse_WordEnableDataWrite)(struct adapter *padapter, u16 efuse_addr, u8 word_en, u8 *data, bool bPseudoTest);
bool (*Efuse_PgPacketWrite_BT)(struct adapter *padapter, u8 offset, u8 word_en, u8 *data, bool bPseudoTest);
--
2.43.0
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 05/16] staging: rtl8723bs: Remove unused function Efuse_PgPacketWrite
2024-11-06 18:33 [PATCH 00/16] staging: rtl8723bs: Replace function pointers starting with EFUSEGetEfuseDefinition Philipp Hortmann
` (3 preceding siblings ...)
2024-11-06 18:33 ` [PATCH 04/16] staging: rtl8723bs: Remove unused function Hal_EfusePgPacketRead Philipp Hortmann
@ 2024-11-06 18:33 ` Philipp Hortmann
2024-11-06 18:33 ` [PATCH 06/16] staging: rtl8723bs: Remove unused function Hal_EfusePgPacketWrite Philipp Hortmann
` (10 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: Philipp Hortmann @ 2024-11-06 18:33 UTC (permalink / raw)
To: Greg Kroah-Hartman, linux-staging, linux-kernel; +Cc: Philipp Hortmann
Remove unused function Efuse_PgPacketWrite.
Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
---
drivers/staging/rtl8723bs/core/rtw_efuse.c | 11 -----------
drivers/staging/rtl8723bs/include/rtw_efuse.h | 1 -
2 files changed, 12 deletions(-)
diff --git a/drivers/staging/rtl8723bs/core/rtw_efuse.c b/drivers/staging/rtl8723bs/core/rtw_efuse.c
index e83daeb9303d..557f87306141 100644
--- a/drivers/staging/rtl8723bs/core/rtw_efuse.c
+++ b/drivers/staging/rtl8723bs/core/rtw_efuse.c
@@ -311,17 +311,6 @@ u8 efuse_OneByteWrite(struct adapter *padapter, u16 addr, u8 data, bool bPseudoT
return bResult;
}
-int
-Efuse_PgPacketWrite(struct adapter *padapter,
- u8 offset,
- u8 word_en,
- u8 *data,
- bool bPseudoTest)
-{
- return padapter->HalFunc.Efuse_PgPacketWrite(padapter, offset, word_en,
- data, bPseudoTest);
-}
-
/*-----------------------------------------------------------------------------
* Function: efuse_WordEnableDataRead
*
diff --git a/drivers/staging/rtl8723bs/include/rtw_efuse.h b/drivers/staging/rtl8723bs/include/rtw_efuse.h
index de4e5906ceb5..546f32dbd33a 100644
--- a/drivers/staging/rtl8723bs/include/rtw_efuse.h
+++ b/drivers/staging/rtl8723bs/include/rtw_efuse.h
@@ -97,7 +97,6 @@ u8 efuse_OneByteRead(struct adapter *padapter, u16 addr, u8 *data, bool bPseudo
u8 efuse_OneByteWrite(struct adapter *padapter, u16 addr, u8 data, bool bPseudoTest);
void Efuse_PowerSwitch(struct adapter *padapter, u8 bWrite, u8 PwrState);
-int Efuse_PgPacketWrite(struct adapter *padapter, u8 offset, u8 word_en, u8 *data, bool bPseudoTest);
void efuse_WordEnableDataRead(u8 word_en, u8 *sourdata, u8 *targetdata);
u8 Efuse_WordEnableDataWrite(struct adapter *padapter, u16 efuse_addr, u8 word_en, u8 *data, bool bPseudoTest);
--
2.43.0
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 06/16] staging: rtl8723bs: Remove unused function Hal_EfusePgPacketWrite
2024-11-06 18:33 [PATCH 00/16] staging: rtl8723bs: Replace function pointers starting with EFUSEGetEfuseDefinition Philipp Hortmann
` (4 preceding siblings ...)
2024-11-06 18:33 ` [PATCH 05/16] staging: rtl8723bs: Remove unused function Efuse_PgPacketWrite Philipp Hortmann
@ 2024-11-06 18:33 ` Philipp Hortmann
2024-11-06 18:33 ` [PATCH 07/16] staging: rtl8723bs: Remove unused function Hal_EfusePgPacketWrite_BT Philipp Hortmann
` (9 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: Philipp Hortmann @ 2024-11-06 18:33 UTC (permalink / raw)
To: Greg Kroah-Hartman, linux-staging, linux-kernel; +Cc: Philipp Hortmann
Remove unused function pointer Efuse_PgPacketWrite and unused function
Hal_EfusePgPacketWrite.
Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
---
.../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 30 -------------------
drivers/staging/rtl8723bs/include/hal_intf.h | 1 -
2 files changed, 31 deletions(-)
diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
index 13fe77f84cc9..432c2c0aa259 100644
--- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
@@ -1365,35 +1365,6 @@ static u8 hal_EfusePgPacketWriteData(
return true;
}
-static s32 Hal_EfusePgPacketWrite(
- struct adapter *padapter,
- u8 offset,
- u8 word_en,
- u8 *pData,
- bool bPseudoTest
-)
-{
- struct pgpkt_struct targetPkt;
- u16 startAddr = 0;
- u8 efuseType = EFUSE_WIFI;
-
- if (!hal_EfusePgCheckAvailableAddr(padapter, efuseType, bPseudoTest))
- return false;
-
- hal_EfuseConstructPGPkt(offset, word_en, pData, &targetPkt);
-
- if (!hal_EfusePartialWriteCheck(padapter, efuseType, &startAddr, &targetPkt, bPseudoTest))
- return false;
-
- if (!hal_EfusePgPacketWriteHeader(padapter, efuseType, &startAddr, &targetPkt, bPseudoTest))
- return false;
-
- if (!hal_EfusePgPacketWriteData(padapter, efuseType, &startAddr, &targetPkt, bPseudoTest))
- return false;
-
- return true;
-}
-
static bool Hal_EfusePgPacketWrite_BT(
struct adapter *padapter,
u8 offset,
@@ -1673,7 +1644,6 @@ void UpdateHalRAMask8723B(struct adapter *padapter, u32 mac_id, u8 rssi_level)
void rtl8723b_set_hal_ops(struct hal_ops *pHalFunc)
{
/* Efuse related function */
- pHalFunc->Efuse_PgPacketWrite = &Hal_EfusePgPacketWrite;
pHalFunc->Efuse_WordEnableDataWrite = &Hal_EfuseWordEnableDataWrite;
pHalFunc->Efuse_PgPacketWrite_BT = &Hal_EfusePgPacketWrite_BT;
diff --git a/drivers/staging/rtl8723bs/include/hal_intf.h b/drivers/staging/rtl8723bs/include/hal_intf.h
index c320795f3fd4..34cd13e49d8f 100644
--- a/drivers/staging/rtl8723bs/include/hal_intf.h
+++ b/drivers/staging/rtl8723bs/include/hal_intf.h
@@ -164,7 +164,6 @@ typedef s32 (*c2h_id_filter)(u8 *c2h_evt);
struct hal_ops {
void (*SetHalODMVarHandler)(struct adapter *padapter, enum hal_odm_variable eVariable, void *pValue1, bool bSet);
- int (*Efuse_PgPacketWrite)(struct adapter *padapter, u8 offset, u8 word_en, u8 *data, bool bPseudoTest);
u8 (*Efuse_WordEnableDataWrite)(struct adapter *padapter, u16 efuse_addr, u8 word_en, u8 *data, bool bPseudoTest);
bool (*Efuse_PgPacketWrite_BT)(struct adapter *padapter, u8 offset, u8 word_en, u8 *data, bool bPseudoTest);
--
2.43.0
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 07/16] staging: rtl8723bs: Remove unused function Hal_EfusePgPacketWrite_BT
2024-11-06 18:33 [PATCH 00/16] staging: rtl8723bs: Replace function pointers starting with EFUSEGetEfuseDefinition Philipp Hortmann
` (5 preceding siblings ...)
2024-11-06 18:33 ` [PATCH 06/16] staging: rtl8723bs: Remove unused function Hal_EfusePgPacketWrite Philipp Hortmann
@ 2024-11-06 18:33 ` Philipp Hortmann
2024-11-06 18:33 ` [PATCH 08/16] staging: rtl8723bs: Remove unused function hal_EfusePgPacketWriteData Philipp Hortmann
` (8 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: Philipp Hortmann @ 2024-11-06 18:33 UTC (permalink / raw)
To: Greg Kroah-Hartman, linux-staging, linux-kernel; +Cc: Philipp Hortmann
Remove unused function pointer Efuse_PgPacketWrite_BT and unused function
Hal_EfusePgPacketWrite_BT.
Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
---
.../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 30 -------------------
drivers/staging/rtl8723bs/include/hal_intf.h | 1 -
2 files changed, 31 deletions(-)
diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
index 432c2c0aa259..fa6fbf0ddc23 100644
--- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
@@ -1365,35 +1365,6 @@ static u8 hal_EfusePgPacketWriteData(
return true;
}
-static bool Hal_EfusePgPacketWrite_BT(
- struct adapter *padapter,
- u8 offset,
- u8 word_en,
- u8 *pData,
- bool bPseudoTest
-)
-{
- struct pgpkt_struct targetPkt;
- u16 startAddr = 0;
- u8 efuseType = EFUSE_BT;
-
- if (!hal_EfusePgCheckAvailableAddr(padapter, efuseType, bPseudoTest))
- return false;
-
- hal_EfuseConstructPGPkt(offset, word_en, pData, &targetPkt);
-
- if (!hal_EfusePartialWriteCheck(padapter, efuseType, &startAddr, &targetPkt, bPseudoTest))
- return false;
-
- if (!hal_EfusePgPacketWriteHeader(padapter, efuseType, &startAddr, &targetPkt, bPseudoTest))
- return false;
-
- if (!hal_EfusePgPacketWriteData(padapter, efuseType, &startAddr, &targetPkt, bPseudoTest))
- return false;
-
- return true;
-}
-
static struct hal_version ReadChipVersion8723B(struct adapter *padapter)
{
u32 value32;
@@ -1645,7 +1616,6 @@ void rtl8723b_set_hal_ops(struct hal_ops *pHalFunc)
{
/* Efuse related function */
pHalFunc->Efuse_WordEnableDataWrite = &Hal_EfuseWordEnableDataWrite;
- pHalFunc->Efuse_PgPacketWrite_BT = &Hal_EfusePgPacketWrite_BT;
pHalFunc->SetHalODMVarHandler = &rtl8723b_SetHalODMVar;
diff --git a/drivers/staging/rtl8723bs/include/hal_intf.h b/drivers/staging/rtl8723bs/include/hal_intf.h
index 34cd13e49d8f..282e141616b0 100644
--- a/drivers/staging/rtl8723bs/include/hal_intf.h
+++ b/drivers/staging/rtl8723bs/include/hal_intf.h
@@ -165,7 +165,6 @@ struct hal_ops {
void (*SetHalODMVarHandler)(struct adapter *padapter, enum hal_odm_variable eVariable, void *pValue1, bool bSet);
u8 (*Efuse_WordEnableDataWrite)(struct adapter *padapter, u16 efuse_addr, u8 word_en, u8 *data, bool bPseudoTest);
- bool (*Efuse_PgPacketWrite_BT)(struct adapter *padapter, u8 offset, u8 word_en, u8 *data, bool bPseudoTest);
s32 (*xmit_thread_handler)(struct adapter *padapter);
void (*hal_notch_filter)(struct adapter *adapter, bool enable);
--
2.43.0
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 08/16] staging: rtl8723bs: Remove unused function hal_EfusePgPacketWriteData
2024-11-06 18:33 [PATCH 00/16] staging: rtl8723bs: Replace function pointers starting with EFUSEGetEfuseDefinition Philipp Hortmann
` (6 preceding siblings ...)
2024-11-06 18:33 ` [PATCH 07/16] staging: rtl8723bs: Remove unused function Hal_EfusePgPacketWrite_BT Philipp Hortmann
@ 2024-11-06 18:33 ` Philipp Hortmann
2024-11-06 18:33 ` [PATCH 09/16] staging: rtl8723bs: Remove unused function hal_EfusePgPacketWriteHeader Philipp Hortmann
` (7 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: Philipp Hortmann @ 2024-11-06 18:33 UTC (permalink / raw)
To: Greg Kroah-Hartman, linux-staging, linux-kernel; +Cc: Philipp Hortmann
Remove unused function hal_EfusePgPacketWriteData to shorten code.
Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
---
.../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 20 -------------------
1 file changed, 20 deletions(-)
diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
index fa6fbf0ddc23..ae909bd1366a 100644
--- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
@@ -1345,26 +1345,6 @@ static u8 hal_EfusePgPacketWriteHeader(
return bRet;
}
-static u8 hal_EfusePgPacketWriteData(
- struct adapter *padapter,
- u8 efuseType,
- u16 *pAddr,
- struct pgpkt_struct *pTargetPkt,
- u8 bPseudoTest
-)
-{
- u16 efuse_addr;
- u8 badworden;
-
-
- efuse_addr = *pAddr;
- badworden = Efuse_WordEnableDataWrite(padapter, efuse_addr+1, pTargetPkt->word_en, pTargetPkt->data, bPseudoTest);
- if (badworden != 0x0F)
- return false;
-
- return true;
-}
-
static struct hal_version ReadChipVersion8723B(struct adapter *padapter)
{
u32 value32;
--
2.43.0
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 09/16] staging: rtl8723bs: Remove unused function hal_EfusePgPacketWriteHeader
2024-11-06 18:33 [PATCH 00/16] staging: rtl8723bs: Replace function pointers starting with EFUSEGetEfuseDefinition Philipp Hortmann
` (7 preceding siblings ...)
2024-11-06 18:33 ` [PATCH 08/16] staging: rtl8723bs: Remove unused function hal_EfusePgPacketWriteData Philipp Hortmann
@ 2024-11-06 18:33 ` Philipp Hortmann
2024-11-06 18:33 ` [PATCH 10/16] staging: rtl8723bs: Remove unused function hal_EfusePartialWriteCheck Philipp Hortmann
` (6 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: Philipp Hortmann @ 2024-11-06 18:33 UTC (permalink / raw)
To: Greg Kroah-Hartman, linux-staging, linux-kernel; +Cc: Philipp Hortmann
Remove unused function hal_EfusePgPacketWriteHeader to shorten code.
Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
---
.../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 18 ------------------
1 file changed, 18 deletions(-)
diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
index ae909bd1366a..155987c417b4 100644
--- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
@@ -1327,24 +1327,6 @@ static u8 hal_EfusePgPacketWrite2ByteHeader(
return true;
}
-static u8 hal_EfusePgPacketWriteHeader(
- struct adapter *padapter,
- u8 efuseType,
- u16 *pAddr,
- struct pgpkt_struct *pTargetPkt,
- u8 bPseudoTest
-)
-{
- u8 bRet = false;
-
- if (pTargetPkt->offset >= EFUSE_MAX_SECTION_BASE)
- bRet = hal_EfusePgPacketWrite2ByteHeader(padapter, efuseType, pAddr, pTargetPkt, bPseudoTest);
- else
- bRet = hal_EfusePgPacketWrite1ByteHeader(padapter, efuseType, pAddr, pTargetPkt, bPseudoTest);
-
- return bRet;
-}
-
static struct hal_version ReadChipVersion8723B(struct adapter *padapter)
{
u32 value32;
--
2.43.0
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 10/16] staging: rtl8723bs: Remove unused function hal_EfusePartialWriteCheck
2024-11-06 18:33 [PATCH 00/16] staging: rtl8723bs: Replace function pointers starting with EFUSEGetEfuseDefinition Philipp Hortmann
` (8 preceding siblings ...)
2024-11-06 18:33 ` [PATCH 09/16] staging: rtl8723bs: Remove unused function hal_EfusePgPacketWriteHeader Philipp Hortmann
@ 2024-11-06 18:33 ` Philipp Hortmann
2024-11-06 18:33 ` [PATCH 11/16] staging: rtl8723bs: Remove unused function hal_EfuseConstructPGPkt Philipp Hortmann
` (5 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: Philipp Hortmann @ 2024-11-06 18:33 UTC (permalink / raw)
To: Greg Kroah-Hartman, linux-staging, linux-kernel; +Cc: Philipp Hortmann
Remove unused function hal_EfusePartialWriteCheck to shorten code.
Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
---
.../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 58 -------------------
1 file changed, 58 deletions(-)
diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
index 155987c417b4..ceb234cdbd74 100644
--- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
@@ -1182,64 +1182,6 @@ static void hal_EfuseConstructPGPkt(
pTargetPkt->word_cnts = Efuse_CalculateWordCnts(pTargetPkt->word_en);
}
-static u8 hal_EfusePartialWriteCheck(
- struct adapter *padapter,
- u8 efuseType,
- u16 *pAddr,
- struct pgpkt_struct *pTargetPkt,
- u8 bPseudoTest
-)
-{
- struct hal_com_data *pHalData = GET_HAL_DATA(padapter);
- struct efuse_hal *pEfuseHal = &pHalData->EfuseHal;
- u8 bRet = false;
- u16 startAddr = 0, efuse_max_available_len = 0, efuse_max = 0;
- u8 efuse_data = 0;
-
- EFUSE_GetEfuseDefinition(padapter, efuseType, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, &efuse_max_available_len, bPseudoTest);
- EFUSE_GetEfuseDefinition(padapter, efuseType, TYPE_EFUSE_CONTENT_LEN_BANK, &efuse_max, bPseudoTest);
-
- if (efuseType == EFUSE_WIFI) {
- if (bPseudoTest) {
-#ifdef HAL_EFUSE_MEMORY
- startAddr = (u16)pEfuseHal->fakeEfuseUsedBytes;
-#else
- startAddr = (u16)fakeEfuseUsedBytes;
-#endif
- } else
- rtw_hal_get_hwreg(padapter, HW_VAR_EFUSE_BYTES, (u8 *)&startAddr);
- } else {
- if (bPseudoTest) {
-#ifdef HAL_EFUSE_MEMORY
- startAddr = (u16)pEfuseHal->fakeBTEfuseUsedBytes;
-#else
- startAddr = (u16)fakeBTEfuseUsedBytes;
-#endif
- } else
- rtw_hal_get_hwreg(padapter, HW_VAR_EFUSE_BT_BYTES, (u8 *)&startAddr);
- }
- startAddr %= efuse_max;
-
- while (1) {
- if (startAddr >= efuse_max_available_len) {
- bRet = false;
- break;
- }
-
- if (efuse_OneByteRead(padapter, startAddr, &efuse_data, bPseudoTest) && (efuse_data != 0xFF)) {
- bRet = false;
- break;
- } else {
- /* not used header, 0xff */
- *pAddr = startAddr;
- bRet = true;
- break;
- }
- }
-
- return bRet;
-}
-
static u8 hal_EfusePgPacketWrite1ByteHeader(
struct adapter *padapter,
u8 efuseType,
--
2.43.0
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 11/16] staging: rtl8723bs: Remove unused function hal_EfuseConstructPGPkt
2024-11-06 18:33 [PATCH 00/16] staging: rtl8723bs: Replace function pointers starting with EFUSEGetEfuseDefinition Philipp Hortmann
` (9 preceding siblings ...)
2024-11-06 18:33 ` [PATCH 10/16] staging: rtl8723bs: Remove unused function hal_EfusePartialWriteCheck Philipp Hortmann
@ 2024-11-06 18:33 ` Philipp Hortmann
2024-11-06 18:33 ` [PATCH 12/16] staging: rtl8723bs: Remove unused function hal_EfusePgCheckAvailableAddr Philipp Hortmann
` (4 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: Philipp Hortmann @ 2024-11-06 18:33 UTC (permalink / raw)
To: Greg Kroah-Hartman, linux-staging, linux-kernel; +Cc: Philipp Hortmann
Remove unused function hal_EfuseConstructPGPkt to shorten code.
Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
---
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 14 --------------
1 file changed, 14 deletions(-)
diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
index ceb234cdbd74..acd9c8128f94 100644
--- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
@@ -1168,20 +1168,6 @@ static u8 hal_EfusePgCheckAvailableAddr(
return true;
}
-static void hal_EfuseConstructPGPkt(
- u8 offset,
- u8 word_en,
- u8 *pData,
- struct pgpkt_struct *pTargetPkt
-)
-{
- memset(pTargetPkt->data, 0xFF, PGPKT_DATA_SIZE);
- pTargetPkt->offset = offset;
- pTargetPkt->word_en = word_en;
- efuse_WordEnableDataRead(word_en, pData, pTargetPkt->data);
- pTargetPkt->word_cnts = Efuse_CalculateWordCnts(pTargetPkt->word_en);
-}
-
static u8 hal_EfusePgPacketWrite1ByteHeader(
struct adapter *padapter,
u8 efuseType,
--
2.43.0
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 12/16] staging: rtl8723bs: Remove unused function hal_EfusePgCheckAvailableAddr
2024-11-06 18:33 [PATCH 00/16] staging: rtl8723bs: Replace function pointers starting with EFUSEGetEfuseDefinition Philipp Hortmann
` (10 preceding siblings ...)
2024-11-06 18:33 ` [PATCH 11/16] staging: rtl8723bs: Remove unused function hal_EfuseConstructPGPkt Philipp Hortmann
@ 2024-11-06 18:33 ` Philipp Hortmann
2024-11-06 18:33 ` [PATCH 13/16] staging: rtl8723bs: Remove function hal_EfusePgPacketWrite2ByteHeader Philipp Hortmann
` (3 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: Philipp Hortmann @ 2024-11-06 18:33 UTC (permalink / raw)
To: Greg Kroah-Hartman, linux-staging, linux-kernel; +Cc: Philipp Hortmann
Remove unused function hal_EfusePgCheckAvailableAddr to shorten code.
Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
---
.../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 17 -----------------
1 file changed, 17 deletions(-)
diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
index acd9c8128f94..9231a4bffb5f 100644
--- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
@@ -1151,23 +1151,6 @@ static u8 Hal_EfuseWordEnableDataWrite(
return badworden;
}
-static u8 hal_EfusePgCheckAvailableAddr(
- struct adapter *padapter, u8 efuseType, u8 bPseudoTest
-)
-{
- u16 max_available = 0;
- u16 current_size;
-
-
- EFUSE_GetEfuseDefinition(padapter, efuseType, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, &max_available, bPseudoTest);
-
- current_size = Efuse_GetCurrentSize(padapter, efuseType, bPseudoTest);
- if (current_size >= max_available)
- return false;
-
- return true;
-}
-
static u8 hal_EfusePgPacketWrite1ByteHeader(
struct adapter *padapter,
u8 efuseType,
--
2.43.0
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 13/16] staging: rtl8723bs: Remove function hal_EfusePgPacketWrite2ByteHeader
2024-11-06 18:33 [PATCH 00/16] staging: rtl8723bs: Replace function pointers starting with EFUSEGetEfuseDefinition Philipp Hortmann
` (11 preceding siblings ...)
2024-11-06 18:33 ` [PATCH 12/16] staging: rtl8723bs: Remove unused function hal_EfusePgCheckAvailableAddr Philipp Hortmann
@ 2024-11-06 18:33 ` Philipp Hortmann
2024-11-06 18:33 ` [PATCH 14/16] staging: rtl8723bs: Remove function hal_EfusePgPacketWrite1ByteHeader Philipp Hortmann
` (2 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: Philipp Hortmann @ 2024-11-06 18:33 UTC (permalink / raw)
To: Greg Kroah-Hartman, linux-staging, linux-kernel; +Cc: Philipp Hortmann
Remove unused function hal_EfusePgPacketWrite2ByteHeader to shorten code.
Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
---
.../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 55 -------------------
1 file changed, 55 deletions(-)
diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
index 9231a4bffb5f..c6cd0f11cd91 100644
--- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
@@ -1183,61 +1183,6 @@ static u8 hal_EfusePgPacketWrite1ByteHeader(
return true;
}
-static u8 hal_EfusePgPacketWrite2ByteHeader(
- struct adapter *padapter,
- u8 efuseType,
- u16 *pAddr,
- struct pgpkt_struct *pTargetPkt,
- u8 bPseudoTest
-)
-{
- u16 efuse_addr, efuse_max_available_len = 0;
- u8 pg_header = 0, tmp_header = 0;
- u8 repeatcnt = 0;
-
- EFUSE_GetEfuseDefinition(padapter, efuseType, TYPE_AVAILABLE_EFUSE_BYTES_BANK, &efuse_max_available_len, bPseudoTest);
-
- efuse_addr = *pAddr;
- if (efuse_addr >= efuse_max_available_len)
- return false;
-
- pg_header = ((pTargetPkt->offset & 0x07) << 5) | 0x0F;
-
- do {
- efuse_OneByteWrite(padapter, efuse_addr, pg_header, bPseudoTest);
- efuse_OneByteRead(padapter, efuse_addr, &tmp_header, bPseudoTest);
- if (tmp_header != 0xFF)
- break;
- if (repeatcnt++ > EFUSE_REPEAT_THRESHOLD_)
- return false;
-
- } while (1);
-
- if (tmp_header != pg_header)
- return false;
-
- /* to write ext_header */
- efuse_addr++;
- pg_header = ((pTargetPkt->offset & 0x78) << 1) | pTargetPkt->word_en;
-
- do {
- efuse_OneByteWrite(padapter, efuse_addr, pg_header, bPseudoTest);
- efuse_OneByteRead(padapter, efuse_addr, &tmp_header, bPseudoTest);
- if (tmp_header != 0xFF)
- break;
- if (repeatcnt++ > EFUSE_REPEAT_THRESHOLD_)
- return false;
-
- } while (1);
-
- if (tmp_header != pg_header) /* offset PG fail */
- return false;
-
- *pAddr = efuse_addr;
-
- return true;
-}
-
static struct hal_version ReadChipVersion8723B(struct adapter *padapter)
{
u32 value32;
--
2.43.0
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 14/16] staging: rtl8723bs: Remove function hal_EfusePgPacketWrite1ByteHeader
2024-11-06 18:33 [PATCH 00/16] staging: rtl8723bs: Replace function pointers starting with EFUSEGetEfuseDefinition Philipp Hortmann
` (12 preceding siblings ...)
2024-11-06 18:33 ` [PATCH 13/16] staging: rtl8723bs: Remove function hal_EfusePgPacketWrite2ByteHeader Philipp Hortmann
@ 2024-11-06 18:33 ` Philipp Hortmann
2024-11-06 18:33 ` [PATCH 15/16] staging: rtl8723bs: Remove unused function efuse_WordEnableDataRead Philipp Hortmann
2024-11-06 18:33 ` [PATCH 16/16] staging: rtl8723bs: Remove unused function Efuse_GetCurrentSize Philipp Hortmann
15 siblings, 0 replies; 17+ messages in thread
From: Philipp Hortmann @ 2024-11-06 18:33 UTC (permalink / raw)
To: Greg Kroah-Hartman, linux-staging, linux-kernel; +Cc: Philipp Hortmann
Remove unused function hal_EfusePgPacketWrite1ByteHeader to shorten code.
Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
---
.../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 32 -------------------
1 file changed, 32 deletions(-)
diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
index c6cd0f11cd91..e15ec6452fd0 100644
--- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
@@ -1151,38 +1151,6 @@ static u8 Hal_EfuseWordEnableDataWrite(
return badworden;
}
-static u8 hal_EfusePgPacketWrite1ByteHeader(
- struct adapter *padapter,
- u8 efuseType,
- u16 *pAddr,
- struct pgpkt_struct *pTargetPkt,
- u8 bPseudoTest
-)
-{
- u8 pg_header = 0, tmp_header = 0;
- u16 efuse_addr = *pAddr;
- u8 repeatcnt = 0;
-
- pg_header = ((pTargetPkt->offset << 4) & 0xf0) | pTargetPkt->word_en;
-
- do {
- efuse_OneByteWrite(padapter, efuse_addr, pg_header, bPseudoTest);
- efuse_OneByteRead(padapter, efuse_addr, &tmp_header, bPseudoTest);
- if (tmp_header != 0xFF)
- break;
- if (repeatcnt++ > EFUSE_REPEAT_THRESHOLD_)
- return false;
-
- } while (1);
-
- if (tmp_header != pg_header)
- return false;
-
- *pAddr = efuse_addr;
-
- return true;
-}
-
static struct hal_version ReadChipVersion8723B(struct adapter *padapter)
{
u32 value32;
--
2.43.0
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 15/16] staging: rtl8723bs: Remove unused function efuse_WordEnableDataRead
2024-11-06 18:33 [PATCH 00/16] staging: rtl8723bs: Replace function pointers starting with EFUSEGetEfuseDefinition Philipp Hortmann
` (13 preceding siblings ...)
2024-11-06 18:33 ` [PATCH 14/16] staging: rtl8723bs: Remove function hal_EfusePgPacketWrite1ByteHeader Philipp Hortmann
@ 2024-11-06 18:33 ` Philipp Hortmann
2024-11-06 18:33 ` [PATCH 16/16] staging: rtl8723bs: Remove unused function Efuse_GetCurrentSize Philipp Hortmann
15 siblings, 0 replies; 17+ messages in thread
From: Philipp Hortmann @ 2024-11-06 18:33 UTC (permalink / raw)
To: Greg Kroah-Hartman, linux-staging, linux-kernel; +Cc: Philipp Hortmann
Remove unused function efuse_WordEnableDataRead to shorten code.
Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
---
drivers/staging/rtl8723bs/core/rtw_efuse.c | 41 -------------------
drivers/staging/rtl8723bs/include/rtw_efuse.h | 1 -
2 files changed, 42 deletions(-)
diff --git a/drivers/staging/rtl8723bs/core/rtw_efuse.c b/drivers/staging/rtl8723bs/core/rtw_efuse.c
index 557f87306141..fcd9ac58b96f 100644
--- a/drivers/staging/rtl8723bs/core/rtw_efuse.c
+++ b/drivers/staging/rtl8723bs/core/rtw_efuse.c
@@ -311,47 +311,6 @@ u8 efuse_OneByteWrite(struct adapter *padapter, u16 addr, u8 data, bool bPseudoT
return bResult;
}
-/*-----------------------------------------------------------------------------
- * Function: efuse_WordEnableDataRead
- *
- * Overview: Read allowed word in current efuse section data.
- *
- * Input: NONE
- *
- * Output: NONE
- *
- * Return: NONE
- *
- * Revised History:
- * When Who Remark
- * 11/16/2008 MHC Create Version 0.
- * 11/21/2008 MHC Fix Write bug when we only enable late word.
- *
- *---------------------------------------------------------------------------*/
-void
-efuse_WordEnableDataRead(u8 word_en,
- u8 *sourdata,
- u8 *targetdata)
-{
- if (!(word_en & BIT(0))) {
- targetdata[0] = sourdata[0];
- targetdata[1] = sourdata[1];
- }
- if (!(word_en & BIT(1))) {
- targetdata[2] = sourdata[2];
- targetdata[3] = sourdata[3];
- }
- if (!(word_en & BIT(2))) {
- targetdata[4] = sourdata[4];
- targetdata[5] = sourdata[5];
- }
- if (!(word_en & BIT(3))) {
- targetdata[6] = sourdata[6];
- targetdata[7] = sourdata[7];
- }
-}
-
-
u8
Efuse_WordEnableDataWrite(struct adapter *padapter,
u16 efuse_addr,
diff --git a/drivers/staging/rtl8723bs/include/rtw_efuse.h b/drivers/staging/rtl8723bs/include/rtw_efuse.h
index 546f32dbd33a..5f72be256acf 100644
--- a/drivers/staging/rtl8723bs/include/rtw_efuse.h
+++ b/drivers/staging/rtl8723bs/include/rtw_efuse.h
@@ -97,7 +97,6 @@ u8 efuse_OneByteRead(struct adapter *padapter, u16 addr, u8 *data, bool bPseudo
u8 efuse_OneByteWrite(struct adapter *padapter, u16 addr, u8 data, bool bPseudoTest);
void Efuse_PowerSwitch(struct adapter *padapter, u8 bWrite, u8 PwrState);
-void efuse_WordEnableDataRead(u8 word_en, u8 *sourdata, u8 *targetdata);
u8 Efuse_WordEnableDataWrite(struct adapter *padapter, u16 efuse_addr, u8 word_en, u8 *data, bool bPseudoTest);
u8 EFUSE_Read1Byte(struct adapter *padapter, u16 Address);
--
2.43.0
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 16/16] staging: rtl8723bs: Remove unused function Efuse_GetCurrentSize
2024-11-06 18:33 [PATCH 00/16] staging: rtl8723bs: Replace function pointers starting with EFUSEGetEfuseDefinition Philipp Hortmann
` (14 preceding siblings ...)
2024-11-06 18:33 ` [PATCH 15/16] staging: rtl8723bs: Remove unused function efuse_WordEnableDataRead Philipp Hortmann
@ 2024-11-06 18:33 ` Philipp Hortmann
15 siblings, 0 replies; 17+ messages in thread
From: Philipp Hortmann @ 2024-11-06 18:33 UTC (permalink / raw)
To: Greg Kroah-Hartman, linux-staging, linux-kernel; +Cc: Philipp Hortmann
Remove unused function Efuse_GetCurrentSize to shorten code.
Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
---
drivers/staging/rtl8723bs/core/rtw_efuse.c | 25 -------------------
drivers/staging/rtl8723bs/include/rtw_efuse.h | 1 -
2 files changed, 26 deletions(-)
diff --git a/drivers/staging/rtl8723bs/core/rtw_efuse.c b/drivers/staging/rtl8723bs/core/rtw_efuse.c
index fcd9ac58b96f..7a74b011dedc 100644
--- a/drivers/staging/rtl8723bs/core/rtw_efuse.c
+++ b/drivers/staging/rtl8723bs/core/rtw_efuse.c
@@ -80,31 +80,6 @@ u8 PwrState)
Hal_EfusePowerSwitch(padapter, bWrite, PwrState);
}
-/*-----------------------------------------------------------------------------
- * Function: Efuse_GetCurrentSize
- *
- * Overview: Get current efuse size!!!
- *
- * Input: NONE
- *
- * Output: NONE
- *
- * Return: NONE
- *
- * Revised History:
- * When Who Remark
- * 11/16/2008 MHC Create Version 0.
- *
- *---------------------------------------------------------------------------*/
-u16
-Efuse_GetCurrentSize(
- struct adapter *padapter,
- u8 efuseType,
- bool bPseudoTest)
-{
- return Hal_EfuseGetCurrentSize(padapter, efuseType, bPseudoTest);
-}
-
/* 11/16/2008 MH Add description. Get current efuse area enabled word!!. */
u8
Efuse_CalculateWordCnts(u8 word_en)
diff --git a/drivers/staging/rtl8723bs/include/rtw_efuse.h b/drivers/staging/rtl8723bs/include/rtw_efuse.h
index 5f72be256acf..d6ea8a4a856f 100644
--- a/drivers/staging/rtl8723bs/include/rtw_efuse.h
+++ b/drivers/staging/rtl8723bs/include/rtw_efuse.h
@@ -90,7 +90,6 @@ extern u8 fakeBTEfuseInitMap[];
extern u8 fakeBTEfuseModifiedMap[];
/*------------------------Export global variable----------------------------*/
-u16 Efuse_GetCurrentSize(struct adapter *padapter, u8 efuseType, bool bPseudoTest);
u8 Efuse_CalculateWordCnts(u8 word_en);
void EFUSE_GetEfuseDefinition(struct adapter *padapter, u8 efuseType, u8 type, void *pOut, bool bPseudoTest);
u8 efuse_OneByteRead(struct adapter *padapter, u16 addr, u8 *data, bool bPseudoTest);
--
2.43.0
^ permalink raw reply related [flat|nested] 17+ messages in thread
end of thread, other threads:[~2024-11-06 18:34 UTC | newest]
Thread overview: 17+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-11-06 18:33 [PATCH 00/16] staging: rtl8723bs: Replace function pointers starting with EFUSEGetEfuseDefinition Philipp Hortmann
2024-11-06 18:33 ` [PATCH 01/16] staging: rtl8723bs: Remove function pointer EFUSEGetEfuseDefinition Philipp Hortmann
2024-11-06 18:33 ` [PATCH 02/16] staging: rtl8723bs: Remove function pointer EfuseGetCurrentSize Philipp Hortmann
2024-11-06 18:33 ` [PATCH 03/16] staging: rtl8723bs: Remove unused function Efuse_PgPacketRead Philipp Hortmann
2024-11-06 18:33 ` [PATCH 04/16] staging: rtl8723bs: Remove unused function Hal_EfusePgPacketRead Philipp Hortmann
2024-11-06 18:33 ` [PATCH 05/16] staging: rtl8723bs: Remove unused function Efuse_PgPacketWrite Philipp Hortmann
2024-11-06 18:33 ` [PATCH 06/16] staging: rtl8723bs: Remove unused function Hal_EfusePgPacketWrite Philipp Hortmann
2024-11-06 18:33 ` [PATCH 07/16] staging: rtl8723bs: Remove unused function Hal_EfusePgPacketWrite_BT Philipp Hortmann
2024-11-06 18:33 ` [PATCH 08/16] staging: rtl8723bs: Remove unused function hal_EfusePgPacketWriteData Philipp Hortmann
2024-11-06 18:33 ` [PATCH 09/16] staging: rtl8723bs: Remove unused function hal_EfusePgPacketWriteHeader Philipp Hortmann
2024-11-06 18:33 ` [PATCH 10/16] staging: rtl8723bs: Remove unused function hal_EfusePartialWriteCheck Philipp Hortmann
2024-11-06 18:33 ` [PATCH 11/16] staging: rtl8723bs: Remove unused function hal_EfuseConstructPGPkt Philipp Hortmann
2024-11-06 18:33 ` [PATCH 12/16] staging: rtl8723bs: Remove unused function hal_EfusePgCheckAvailableAddr Philipp Hortmann
2024-11-06 18:33 ` [PATCH 13/16] staging: rtl8723bs: Remove function hal_EfusePgPacketWrite2ByteHeader Philipp Hortmann
2024-11-06 18:33 ` [PATCH 14/16] staging: rtl8723bs: Remove function hal_EfusePgPacketWrite1ByteHeader Philipp Hortmann
2024-11-06 18:33 ` [PATCH 15/16] staging: rtl8723bs: Remove unused function efuse_WordEnableDataRead Philipp Hortmann
2024-11-06 18:33 ` [PATCH 16/16] staging: rtl8723bs: Remove unused function Efuse_GetCurrentSize Philipp Hortmann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).