* [PATCH v5 0/2] staging: rtl8723bs: clean up phy status structs and casts
@ 2026-10-13 19:15 Timo Joannin
2026-10-13 19:15 ` [PATCH v5 1/2] staging: rtl8723bs: rename struct phy_status_rpt_8192cd_t to rtl8723bs_phy_status_rpt Timo Joannin
2026-10-13 19:15 ` [PATCH v5 2/2] staging: rtl8723bs: unwind cast mess and remove phy_stat struct Timo Joannin
0 siblings, 2 replies; 3+ messages in thread
From: Timo Joannin @ 2026-10-13 19:15 UTC (permalink / raw)
To: gregkh; +Cc: linux-staging, linux-kernel, error27, guojy.bj, Timo Joannin
Hey Now,
This patch series splits the v3 patch into a 2-part series as requested,
separating the struct renaming from the cast mess unwinding.
Changes in v5:
- Rebased against the latest staging/staging-testing branch.
- Resolved minor merge conflicts in odm_HWConfig.c.
Changes in v4:
- Split monolithic patch into 2-part series.
- Removed dead struct phy_stat and unused prototype
rtl8723b_query_rx_phy_status().
Changes in v3:
- Included patch version changelog (missed in v2, sorry).
Changes in v2:
- Propagated the real struct type through
the call chain to remove u8 * casting.
Regarding your question about the existence of struct phy_stat,
I discovered it was dead code; no function actually used it. Furthermore,
the rtl8723b_query_rx_phy_status() function prototype referencing
it was also unused, and was removed.
Patch 1 renames struct phy_status_rpt_8192cd_t
to rtl8723bs_phy_status_rpt.
Patch 2 unwinds the cast mess and propagates
the real struct type all the way through
the call chain, and removes the unused phy_stat struct
and ghost function prototype.
Timo Joannin (2):
staging: rtl8723bs: rename struct phy_status_rpt_8192cd_t to
rtl8723bs_phy_status_rpt.
staging: rtl8723bs: unwind cast mess and remove phy_stat struct
drivers/staging/rtl8723bs/hal/odm_HWConfig.c | 215 +++++++++++-------
.../staging/rtl8723bs/include/rtl8192c_recv.h | 18 --
.../staging/rtl8723bs/include/rtl8723b_recv.h | 1 -
3 files changed, 134 insertions(+), 100 deletions(-)
--
2.56.0
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH v5 1/2] staging: rtl8723bs: rename struct phy_status_rpt_8192cd_t to rtl8723bs_phy_status_rpt.
2026-10-13 19:15 [PATCH v5 0/2] staging: rtl8723bs: clean up phy status structs and casts Timo Joannin
@ 2026-10-13 19:15 ` Timo Joannin
2026-10-13 19:15 ` [PATCH v5 2/2] staging: rtl8723bs: unwind cast mess and remove phy_stat struct Timo Joannin
1 sibling, 0 replies; 3+ messages in thread
From: Timo Joannin @ 2026-10-13 19:15 UTC (permalink / raw)
To: gregkh; +Cc: linux-staging, linux-kernel, error27, guojy.bj, Timo Joannin
The struct identifier references the 8192CD chip while being in a
rtl8723bs codebase. Additionally, the identifier uses the _t suffix,
while being generally reserved for typedef identifiers.
Rename the struct to rtl8723bs_phy_status_rpt
across the rtl8723bs codebase to accurately
reflect the driver and clean up the naming.
Signed-off-by: Timo Joannin <timo.joannin@gmail.com>
---
drivers/staging/rtl8723bs/hal/odm_HWConfig.c | 210 ++++++++++++-------
1 file changed, 129 insertions(+), 81 deletions(-)
diff --git a/drivers/staging/rtl8723bs/hal/odm_HWConfig.c b/drivers/staging/rtl8723bs/hal/odm_HWConfig.c
index 173ef3f437b9..fb3a19da5de3 100644
--- a/drivers/staging/rtl8723bs/hal/odm_HWConfig.c
+++ b/drivers/staging/rtl8723bs/hal/odm_HWConfig.c
@@ -10,23 +10,22 @@
static u8 odm_query_rx_pwr_percentage(s8 ant_power)
{
if ((ant_power <= -100) || (ant_power >= 20))
- return 0;
+ return 0;
else if (ant_power >= 0)
- return 100;
+ return 100;
else
return 100 + ant_power;
-
}
s32 odm_signal_scale_mapping(struct dm_odm_t *dm_odm, s32 curr_sig)
{
s32 ret_sig = 0;
- if (dm_odm->SupportInterface == ODM_ITRF_SDIO) {
+ if (dm_odm->SupportInterface == ODM_ITRF_SDIO) {
if (curr_sig >= 51 && curr_sig <= 100)
ret_sig = 100;
else if (curr_sig >= 41 && curr_sig <= 50)
- ret_sig = 80 + ((curr_sig - 40)*2);
+ ret_sig = 80 + ((curr_sig - 40) * 2);
else if (curr_sig >= 31 && curr_sig <= 40)
ret_sig = 66 + (curr_sig - 30);
else if (curr_sig >= 21 && curr_sig <= 30)
@@ -71,8 +70,8 @@ static s8 odm_cck_rssi(u8 lna_idx, u8 vga_idx)
s8 rx_pwr_all = 0x00;
switch (lna_idx) {
- /* 46 53 73 95 201301231630 */
- /* 46 53 77 99 201301241630 */
+ /* 46 53 73 95 201301231630 */
+ /* 46 53 77 99 201301241630 */
case 6:
rx_pwr_all = -34 - (2 * vga_idx);
@@ -93,10 +92,11 @@ static s8 odm_cck_rssi(u8 lna_idx, u8 vga_idx)
return rx_pwr_all;
}
-static void odm_rx_phy_status_parsing(struct dm_odm_t *dm_odm,
- struct odm_phy_info *phy_info,
- struct rtl8723bs_phy_status_rpt *phy_sta_rpt,
- struct odm_packet_info *pkt_info)
+static void
+odm_rx_phy_status_parsing(struct dm_odm_t *dm_odm,
+ struct odm_phy_info *phy_info,
+ struct rtl8723bs_phy_status_rpt *phy_sta_rpt,
+ struct odm_packet_info *pkt_info)
{
u8 i;
s8 rx_pwr[4], rx_pwr_all = 0;
@@ -127,7 +127,7 @@ static void odm_rx_phy_status_parsing(struct dm_odm_t *dm_odm,
* 2011.11.28 LukeLee: 88E use different LNA & VGA gain table
* The RSSI formula should be modified according to the gain table
*/
- lna_idx = ((cck_agc_rpt & 0xE0)>>5);
+ lna_idx = ((cck_agc_rpt & 0xE0) >> 5);
vga_idx = (cck_agc_rpt & 0x1F);
rx_pwr_all = odm_cck_rssi(lna_idx, vga_idx);
pwdb_all = odm_query_rx_pwr_percentage(rx_pwr_all);
@@ -147,15 +147,15 @@ static void odm_rx_phy_status_parsing(struct dm_odm_t *dm_odm,
if (phy_info->rx_pwd_ba11 > 40 && !dm_odm->bInHctTest)
sq = 100;
else {
- sq_rpt = phy_sta_rpt->cck_sig_qual_ofdm_pwdb_all;
+ sq_rpt =
+ phy_sta_rpt->cck_sig_qual_ofdm_pwdb_all;
if (sq_rpt > 64)
sq = 0;
else if (sq_rpt < 20)
sq = 100;
else
- sq = ((64-sq_rpt) * 100) / 44;
-
+ sq = ((64 - sq_rpt) * 100) / 44;
}
phy_info->signal_quality = sq;
@@ -174,9 +174,11 @@ static void odm_rx_phy_status_parsing(struct dm_odm_t *dm_odm,
if (dm_odm->RFPathRxEnable & BIT(i))
rf_rx_num++;
/* else */
- /* continue; */
+ /* continue; */
- rx_pwr[i] = ((phy_sta_rpt->path_agc[i].gain & 0x3F) * 2) - 110;
+ rx_pwr[i] =
+ ((phy_sta_rpt->path_agc[i].gain & 0x3F) * 2) -
+ 110;
phy_info->rx_pwr[i] = rx_pwr[i];
@@ -187,15 +189,19 @@ static void odm_rx_phy_status_parsing(struct dm_odm_t *dm_odm,
phy_info->rx_mimo_signal_strength[i] = (u8)rssi;
/* Get Rx snr value in DB */
- phy_info->rx_snr[i] = dm_odm->PhyDbgInfo.RxSNRdB[i] = (s32)(phy_sta_rpt->path_rxsnr[i]/2);
+ phy_info->rx_snr[i] = dm_odm->PhyDbgInfo.RxSNRdB[i] =
+ (s32)(phy_sta_rpt->path_rxsnr[i] / 2);
}
/*
* (2)PWDB, Average PWDB calculated by hardware (for rate adaptive)
*/
- rx_pwr_all = ((phy_sta_rpt->cck_sig_qual_ofdm_pwdb_all >> 1) & 0x7f) - 110;
+ rx_pwr_all = ((phy_sta_rpt->cck_sig_qual_ofdm_pwdb_all >> 1) &
+ 0x7f) -
+ 110;
- pwdb_all_bt = pwdb_all = odm_query_rx_pwr_percentage(rx_pwr_all);
+ pwdb_all_bt = pwdb_all =
+ odm_query_rx_pwr_percentage(rx_pwr_all);
phy_info->rx_pwd_ba11 = pwdb_all;
phy_info->bt_rx_rssi_percentage = pwdb_all_bt;
@@ -215,7 +221,8 @@ static void odm_rx_phy_status_parsing(struct dm_odm_t *dm_odm,
* is supposed to be negative) is not correct
* anymore.
*/
- evm = odm_evm_db_to_percentage(phy_sta_rpt->stream_rxevm[0]); /* dbm */
+ evm = odm_evm_db_to_percentage(
+ phy_sta_rpt->stream_rxevm[0]); /* dbm */
/* Fill value in RFD, Get the first spatial stream only */
phy_info->signal_quality = (u8)(evm & 0xff);
@@ -231,19 +238,22 @@ static void odm_rx_phy_status_parsing(struct dm_odm_t *dm_odm,
* It is assigned to the BSS List in GetValueFromBeaconOrProbeRsp().
*/
if (is_cck_rate) {
- phy_info->signal_strength = (u8)(odm_signal_scale_mapping(dm_odm, pwdb_all));
+ phy_info->signal_strength =
+ (u8)(odm_signal_scale_mapping(dm_odm, pwdb_all));
} else {
if (rf_rx_num != 0)
- phy_info->signal_strength = (u8)(odm_signal_scale_mapping(dm_odm, total_rssi /= rf_rx_num));
+ phy_info->signal_strength =
+ (u8)(odm_signal_scale_mapping(
+ dm_odm, total_rssi /= rf_rx_num));
}
}
-static void odm_Process_RSSIForDM(
- struct dm_odm_t *pDM_Odm, struct odm_phy_info *pPhyInfo, struct odm_packet_info *pPktinfo
-)
+static void odm_Process_RSSIForDM(struct dm_odm_t *pDM_Odm,
+ struct odm_phy_info *pPhyInfo,
+ struct odm_packet_info *pPktinfo)
{
-
- s32 UndecoratedSmoothedPWDB, UndecoratedSmoothedCCK, UndecoratedSmoothedOFDM, RSSI_Ave;
+ s32 UndecoratedSmoothedPWDB, UndecoratedSmoothedCCK,
+ UndecoratedSmoothedOFDM, RSSI_Ave;
u8 isCCKrate = 0;
u8 RSSI_max, RSSI_min, i;
u32 OFDM_pkt = 0;
@@ -269,7 +279,6 @@ static void odm_Process_RSSIForDM(
/* Statistic for antenna/path diversity------------------ */
if (pDM_Odm->SupportAbility & ODM_BB_ANT_DIV) {
-
}
/* Smart Antenna Debug Message------------------ */
@@ -279,76 +288,102 @@ static void odm_Process_RSSIForDM(
UndecoratedSmoothedPWDB = pEntry->rssi_stat.UndecoratedSmoothedPWDB;
if (pPktinfo->to_self || pPktinfo->is_beacon) {
-
if (!isCCKrate) { /* ofdm rate */
if (pPhyInfo->rx_mimo_signal_strength[RF_PATH_B] == 0) {
- RSSI_Ave = pPhyInfo->rx_mimo_signal_strength[RF_PATH_A];
- pDM_Odm->RSSI_A = pPhyInfo->rx_mimo_signal_strength[RF_PATH_A];
+ RSSI_Ave = pPhyInfo->rx_mimo_signal_strength
+ [RF_PATH_A];
+ pDM_Odm->RSSI_A =
+ pPhyInfo->rx_mimo_signal_strength
+ [RF_PATH_A];
pDM_Odm->RSSI_B = 0;
} else {
- pDM_Odm->RSSI_A = pPhyInfo->rx_mimo_signal_strength[RF_PATH_A];
- pDM_Odm->RSSI_B = pPhyInfo->rx_mimo_signal_strength[RF_PATH_B];
-
- if (
- pPhyInfo->rx_mimo_signal_strength[RF_PATH_A] >
- pPhyInfo->rx_mimo_signal_strength[RF_PATH_B]
- ) {
- RSSI_max = pPhyInfo->rx_mimo_signal_strength[RF_PATH_A];
- RSSI_min = pPhyInfo->rx_mimo_signal_strength[RF_PATH_B];
+ pDM_Odm->RSSI_A =
+ pPhyInfo->rx_mimo_signal_strength
+ [RF_PATH_A];
+ pDM_Odm->RSSI_B =
+ pPhyInfo->rx_mimo_signal_strength
+ [RF_PATH_B];
+
+ if (pPhyInfo->rx_mimo_signal_strength[RF_PATH_A] >
+ pPhyInfo->rx_mimo_signal_strength[RF_PATH_B]) {
+ RSSI_max =
+ pPhyInfo->rx_mimo_signal_strength
+ [RF_PATH_A];
+ RSSI_min =
+ pPhyInfo->rx_mimo_signal_strength
+ [RF_PATH_B];
} else {
- RSSI_max = pPhyInfo->rx_mimo_signal_strength[RF_PATH_B];
- RSSI_min = pPhyInfo->rx_mimo_signal_strength[RF_PATH_A];
+ RSSI_max =
+ pPhyInfo->rx_mimo_signal_strength
+ [RF_PATH_B];
+ RSSI_min =
+ pPhyInfo->rx_mimo_signal_strength
+ [RF_PATH_A];
}
- if ((RSSI_max-RSSI_min) < 3)
+ if ((RSSI_max - RSSI_min) < 3)
RSSI_Ave = RSSI_max;
- else if ((RSSI_max-RSSI_min) < 6)
+ else if ((RSSI_max - RSSI_min) < 6)
RSSI_Ave = RSSI_max - 1;
- else if ((RSSI_max-RSSI_min) < 10)
+ else if ((RSSI_max - RSSI_min) < 10)
RSSI_Ave = RSSI_max - 2;
else
RSSI_Ave = RSSI_max - 3;
}
/* 1 Process OFDM RSSI */
- if (UndecoratedSmoothedOFDM <= 0) /* initialize */
+ if (UndecoratedSmoothedOFDM <= 0) /* initialize */
UndecoratedSmoothedOFDM = pPhyInfo->rx_pwd_ba11;
else {
- if (pPhyInfo->rx_pwd_ba11 > (u32)UndecoratedSmoothedOFDM) {
+ if (pPhyInfo->rx_pwd_ba11 >
+ (u32)UndecoratedSmoothedOFDM) {
+ UndecoratedSmoothedOFDM =
+ ((UndecoratedSmoothedOFDM *
+ (Rx_Smooth_Factor - 1)) +
+ RSSI_Ave) /
+ Rx_Smooth_Factor;
UndecoratedSmoothedOFDM =
- ((UndecoratedSmoothedOFDM*(Rx_Smooth_Factor-1)) +
- RSSI_Ave)/Rx_Smooth_Factor;
- UndecoratedSmoothedOFDM = UndecoratedSmoothedOFDM + 1;
+ UndecoratedSmoothedOFDM + 1;
} else {
UndecoratedSmoothedOFDM =
- ((UndecoratedSmoothedOFDM*(Rx_Smooth_Factor-1)) +
- RSSI_Ave)/Rx_Smooth_Factor;
+ ((UndecoratedSmoothedOFDM *
+ (Rx_Smooth_Factor - 1)) +
+ RSSI_Ave) /
+ Rx_Smooth_Factor;
}
}
- pEntry->rssi_stat.PacketMap = (pEntry->rssi_stat.PacketMap<<1) | BIT(0);
+ pEntry->rssi_stat.PacketMap =
+ (pEntry->rssi_stat.PacketMap << 1) | BIT(0);
} else {
RSSI_Ave = pPhyInfo->rx_pwd_ba11;
- pDM_Odm->RSSI_A = (u8) pPhyInfo->rx_pwd_ba11;
+ pDM_Odm->RSSI_A = (u8)pPhyInfo->rx_pwd_ba11;
pDM_Odm->RSSI_B = 0;
/* 1 Process CCK RSSI */
- if (UndecoratedSmoothedCCK <= 0) /* initialize */
+ if (UndecoratedSmoothedCCK <= 0) /* initialize */
UndecoratedSmoothedCCK = pPhyInfo->rx_pwd_ba11;
else {
- if (pPhyInfo->rx_pwd_ba11 > (u32)UndecoratedSmoothedCCK) {
+ if (pPhyInfo->rx_pwd_ba11 >
+ (u32)UndecoratedSmoothedCCK) {
+ UndecoratedSmoothedCCK =
+ ((UndecoratedSmoothedCCK *
+ (Rx_Smooth_Factor - 1)) +
+ pPhyInfo->rx_pwd_ba11) /
+ Rx_Smooth_Factor;
UndecoratedSmoothedCCK =
- ((UndecoratedSmoothedCCK*(Rx_Smooth_Factor-1)) +
- pPhyInfo->rx_pwd_ba11)/Rx_Smooth_Factor;
- UndecoratedSmoothedCCK = UndecoratedSmoothedCCK + 1;
+ UndecoratedSmoothedCCK + 1;
} else {
UndecoratedSmoothedCCK =
- ((UndecoratedSmoothedCCK*(Rx_Smooth_Factor-1)) +
- pPhyInfo->rx_pwd_ba11)/Rx_Smooth_Factor;
+ ((UndecoratedSmoothedCCK *
+ (Rx_Smooth_Factor - 1)) +
+ pPhyInfo->rx_pwd_ba11) /
+ Rx_Smooth_Factor;
}
}
- pEntry->rssi_stat.PacketMap = pEntry->rssi_stat.PacketMap<<1;
+ pEntry->rssi_stat.PacketMap =
+ pEntry->rssi_stat.PacketMap << 1;
}
/* if (pEntry) */
@@ -360,32 +395,48 @@ static void odm_Process_RSSIForDM(
pEntry->rssi_stat.ValidBit++;
for (i = 0; i < pEntry->rssi_stat.ValidBit; i++)
- OFDM_pkt += (u8)(pEntry->rssi_stat.PacketMap>>i)&BIT(0);
+ OFDM_pkt +=
+ (u8)(pEntry->rssi_stat.PacketMap >> i) &
+ BIT(0);
if (pEntry->rssi_stat.ValidBit == 64) {
- Weighting = ((OFDM_pkt<<4) > 64)?64:(OFDM_pkt<<4);
- UndecoratedSmoothedPWDB = (Weighting*UndecoratedSmoothedOFDM+(64-Weighting)*UndecoratedSmoothedCCK)>>6;
+ Weighting = ((OFDM_pkt << 4) > 64) ?
+ 64 :
+ (OFDM_pkt << 4);
+ UndecoratedSmoothedPWDB =
+ (Weighting * UndecoratedSmoothedOFDM +
+ (64 - Weighting) *
+ UndecoratedSmoothedCCK) >>
+ 6;
} else {
if (pEntry->rssi_stat.ValidBit != 0)
- UndecoratedSmoothedPWDB = (OFDM_pkt*UndecoratedSmoothedOFDM+(pEntry->rssi_stat.ValidBit-OFDM_pkt)*UndecoratedSmoothedCCK)/pEntry->rssi_stat.ValidBit;
+ UndecoratedSmoothedPWDB =
+ (OFDM_pkt *
+ UndecoratedSmoothedOFDM +
+ (pEntry->rssi_stat.ValidBit -
+ OFDM_pkt) *
+ UndecoratedSmoothedCCK) /
+ pEntry->rssi_stat.ValidBit;
else
UndecoratedSmoothedPWDB = 0;
}
- pEntry->rssi_stat.UndecoratedSmoothedCCK = UndecoratedSmoothedCCK;
- pEntry->rssi_stat.UndecoratedSmoothedOFDM = UndecoratedSmoothedOFDM;
- pEntry->rssi_stat.UndecoratedSmoothedPWDB = UndecoratedSmoothedPWDB;
+ pEntry->rssi_stat.UndecoratedSmoothedCCK =
+ UndecoratedSmoothedCCK;
+ pEntry->rssi_stat.UndecoratedSmoothedOFDM =
+ UndecoratedSmoothedOFDM;
+ pEntry->rssi_stat.UndecoratedSmoothedPWDB =
+ UndecoratedSmoothedPWDB;
}
-
}
}
/* Endianness before calling this API */
-void odm_phy_status_query(struct dm_odm_t *dm_odm, struct odm_phy_info *phy_info,
+void odm_phy_status_query(struct dm_odm_t *dm_odm,
+ struct odm_phy_info *phy_info,
struct rtl8723bs_phy_status_rpt *phy_status,
struct odm_packet_info *pkt_info)
{
-
odm_rx_phy_status_parsing(dm_odm, phy_info, phy_status, pkt_info);
if (!dm_odm->RSSI_test)
@@ -394,11 +445,9 @@ void odm_phy_status_query(struct dm_odm_t *dm_odm, struct odm_phy_info *phy_info
/* If you want to add a new IC, Please follow below template and generate a new one. */
-void ODM_ConfigRFWithHeaderFile(
- struct dm_odm_t *pDM_Odm,
- enum ODM_RF_Config_Type ConfigType,
- enum rf_path eRFPath
-)
+void ODM_ConfigRFWithHeaderFile(struct dm_odm_t *pDM_Odm,
+ enum ODM_RF_Config_Type ConfigType,
+ enum rf_path eRFPath)
{
if (ConfigType == CONFIG_RF_RADIO)
ODM_ReadAndConfig_MP_8723B_RadioA(pDM_Odm);
@@ -412,9 +461,8 @@ void ODM_ConfigRFWithTxPwrTrackHeaderFile(struct dm_odm_t *pDM_Odm)
ODM_ReadAndConfig_MP_8723B_TxPowerTrack_SDIO(pDM_Odm);
}
-void ODM_ConfigBBWithHeaderFile(
- struct dm_odm_t *pDM_Odm, enum ODM_BB_Config_Type ConfigType
-)
+void ODM_ConfigBBWithHeaderFile(struct dm_odm_t *pDM_Odm,
+ enum ODM_BB_Config_Type ConfigType)
{
if (ConfigType == CONFIG_BB_PHY_REG)
ODM_ReadAndConfig_MP_8723B_PHY_REG(pDM_Odm);
--
2.56.0
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH v5 2/2] staging: rtl8723bs: unwind cast mess and remove phy_stat struct
2026-10-13 19:15 [PATCH v5 0/2] staging: rtl8723bs: clean up phy status structs and casts Timo Joannin
2026-10-13 19:15 ` [PATCH v5 1/2] staging: rtl8723bs: rename struct phy_status_rpt_8192cd_t to rtl8723bs_phy_status_rpt Timo Joannin
@ 2026-10-13 19:15 ` Timo Joannin
1 sibling, 0 replies; 3+ messages in thread
From: Timo Joannin @ 2026-10-13 19:15 UTC (permalink / raw)
To: gregkh; +Cc: linux-staging, linux-kernel, error27, guojy.bj, Timo Joannin
Propagate the real struct type all the way through
the call chain to remove redundant casts to and from u8 *.
Remove redundant phy_stat struct, along with the dead function
prototype rtl8723b_query_rx_phy_status() which referenced it.
Signed-off-by: Timo Joannin <timo.joannin@gmail.com>
---
drivers/staging/rtl8723bs/hal/odm_HWConfig.c | 5 +++++
.../staging/rtl8723bs/include/rtl8192c_recv.h | 18 ------------------
.../staging/rtl8723bs/include/rtl8723b_recv.h | 1 -
3 files changed, 5 insertions(+), 19 deletions(-)
diff --git a/drivers/staging/rtl8723bs/hal/odm_HWConfig.c b/drivers/staging/rtl8723bs/hal/odm_HWConfig.c
index fb3a19da5de3..c0a079003e73 100644
--- a/drivers/staging/rtl8723bs/hal/odm_HWConfig.c
+++ b/drivers/staging/rtl8723bs/hal/odm_HWConfig.c
@@ -432,8 +432,13 @@ static void odm_Process_RSSIForDM(struct dm_odm_t *pDM_Odm,
}
/* Endianness before calling this API */
+<<<<<<< HEAD
void odm_phy_status_query(struct dm_odm_t *dm_odm,
struct odm_phy_info *phy_info,
+=======
+void odm_phy_status_query(struct dm_odm_t *dm_odm,
+ struct odm_phy_info *phy_info,
+>>>>>>> f52adf8 (staging: rtl8723bs: unwind cast mess and remove phy_stat struct)
struct rtl8723bs_phy_status_rpt *phy_status,
struct odm_packet_info *pkt_info)
{
diff --git a/drivers/staging/rtl8723bs/include/rtl8192c_recv.h b/drivers/staging/rtl8723bs/include/rtl8192c_recv.h
index b63625ab4e45..072e2b5f6129 100644
--- a/drivers/staging/rtl8723bs/include/rtl8192c_recv.h
+++ b/drivers/staging/rtl8723bs/include/rtl8192c_recv.h
@@ -9,24 +9,6 @@
#define MAX_RECVBUF_SZ (10240)
-struct phy_stat {
- unsigned int phydw0;
-
- unsigned int phydw1;
-
- unsigned int phydw2;
-
- unsigned int phydw3;
-
- unsigned int phydw4;
-
- unsigned int phydw5;
-
- unsigned int phydw6;
-
- unsigned int phydw7;
-};
-
/* Rx smooth factor */
#define Rx_Smooth_Factor (20)
diff --git a/drivers/staging/rtl8723bs/include/rtl8723b_recv.h b/drivers/staging/rtl8723bs/include/rtl8723b_recv.h
index e9ebecb224a6..2f230e2d27a4 100644
--- a/drivers/staging/rtl8723bs/include/rtl8723b_recv.h
+++ b/drivers/staging/rtl8723bs/include/rtl8723b_recv.h
@@ -84,7 +84,6 @@ struct rxreport_8723b {
s32 rtl8723bs_init_recv_priv(struct adapter *padapter);
void rtl8723bs_free_recv_priv(struct adapter *padapter);
-void rtl8723b_query_rx_phy_status(union recv_frame *prframe, struct phy_stat *pphy_stat);
void rtl8723b_process_phy_info(struct adapter *padapter, void *prframe);
void rtl8723b_read_chip_version(struct adapter *padapter);
--
2.56.0
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2026-10-13 19:16 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-10-13 19:15 [PATCH v5 0/2] staging: rtl8723bs: clean up phy status structs and casts Timo Joannin
2026-10-13 19:15 ` [PATCH v5 1/2] staging: rtl8723bs: rename struct phy_status_rpt_8192cd_t to rtl8723bs_phy_status_rpt Timo Joannin
2026-10-13 19:15 ` [PATCH v5 2/2] staging: rtl8723bs: unwind cast mess and remove phy_stat struct Timo Joannin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®