From: Luka Gejak <lukagejak5@gmail.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Dan Carpenter <dan.carpenter@linaro.org>,
linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org,
Luka Gejak <lukagejak5@gmail.com>
Subject: [PATCH v1 2/5] staging: rtl8723bs: convert PSTA_INFO_T to struct sta_info *
Date: Mon, 2 Feb 2026 08:07:49 +0100 [thread overview]
Message-ID: <20260202070752.3391-3-lukagejak5@gmail.com> (raw)
In-Reply-To: <20260202070752.3391-1-lukagejak5@gmail.com>
Replace the vendor-specific PSTA_INFO_T typedef with the standard Linux
kernel type 'struct sta_info *' throughout the driver.
Changes:
- Replace all usages of PSTA_INFO_T with struct sta_info * in odm.c,
odm.h, and odm_HWConfig.c
- Remove the PSTA_INFO_T and STA_INFO_T macro definitions from
odm_types.h as they are no longer needed
This addresses the second TODO item: convert any remaining unusual
variable types.
Signed-off-by: Luka Gejak <lukagejak5@gmail.com>
---
drivers/staging/rtl8723bs/hal/odm.c | 10 +++++-----
drivers/staging/rtl8723bs/hal/odm.h | 4 ++--
drivers/staging/rtl8723bs/hal/odm_HWConfig.c | 2 +-
drivers/staging/rtl8723bs/hal/odm_types.h | 3 ---
4 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/drivers/staging/rtl8723bs/hal/odm.c b/drivers/staging/rtl8723bs/hal/odm.c
index 639b6da2302b..a22354f728c1 100644
--- a/drivers/staging/rtl8723bs/hal/odm.c
+++ b/drivers/staging/rtl8723bs/hal/odm.c
@@ -141,7 +141,7 @@ static void odm_CommonInfoSelfUpdate(struct dm_odm_t *pDM_Odm)
{
u8 EntryCnt = 0;
u8 i;
- PSTA_INFO_T pEntry;
+ struct sta_info *pEntry;
if (*(pDM_Odm->pBandWidth) == ODM_BW40M) {
if (*(pDM_Odm->pSecChOffset) == 1)
@@ -194,7 +194,7 @@ u32 ODM_Get_Rate_Bitmap(
u8 rssi_level
)
{
- PSTA_INFO_T pEntry;
+ struct sta_info *pEntry;
u32 rate_bitmap = 0;
u8 WirelessMode;
@@ -264,7 +264,7 @@ static void odm_RefreshRateAdaptiveMaskCE(struct dm_odm_t *pDM_Odm)
return;
for (i = 0; i < ODM_ASSOCIATE_ENTRY_NUM; i++) {
- PSTA_INFO_T pstat = pDM_Odm->pODM_StaInfo[i];
+ struct sta_info *pstat = pDM_Odm->pODM_StaInfo[i];
if (IS_STA_VALID(pstat)) {
if (is_multicast_ether_addr(pstat->hwaddr)) /* if (psta->mac_id == 1) */
@@ -841,7 +841,7 @@ void ODM_CmnInfoHook(struct dm_odm_t *pDM_Odm, enum odm_cmninfo_e CmnInfo, void
/* pDM_Odm->BTCoexist = (bool *)pValue; */
/* case ODM_CMNINFO_STA_STATUS: */
- /* pDM_Odm->pODM_StaInfo[] = (PSTA_INFO_T)pValue; */
+ /* pDM_Odm->pODM_StaInfo[] = (struct sta_info *)pValue; */
/* break; */
/* case ODM_CMNINFO_PHY_STATUS: */
@@ -875,7 +875,7 @@ void ODM_CmnInfoPtrArrayHook(
/* Dynamic call by reference pointer. */
/* */
case ODM_CMNINFO_STA_STATUS:
- pDM_Odm->pODM_StaInfo[Index] = (PSTA_INFO_T)pValue;
+ pDM_Odm->pODM_StaInfo[Index] = (struct sta_info *)pValue;
break;
/* To remove the compiler warning, must add an empty default statement to handle the other values. */
default:
diff --git a/drivers/staging/rtl8723bs/hal/odm.h b/drivers/staging/rtl8723bs/hal/odm.h
index 38830552d5bc..856d454b0181 100644
--- a/drivers/staging/rtl8723bs/hal/odm.h
+++ b/drivers/staging/rtl8723bs/hal/odm.h
@@ -853,7 +853,7 @@ struct dm_odm_t { /* DM_Out_Source_Dynamic_Mechanism_Structure */
/* 2 Define STA info. */
/* _ODM_STA_INFO */
/* 2012/01/12 MH For MP, we need to reduce one array pointer for default port.?? */
- PSTA_INFO_T pODM_StaInfo[ODM_ASSOCIATE_ENTRY_NUM];
+ struct sta_info *pODM_StaInfo[ODM_ASSOCIATE_ENTRY_NUM];
/* */
/* 2012/02/14 MH Add to share 88E ra with other SW team. */
@@ -910,7 +910,7 @@ struct dm_odm_t { /* DM_Out_Source_Dynamic_Mechanism_Structure */
/* u8 binitialized; for dm_initial_gain_Multi_STA use. */
/* for Antenna diversity */
/* u8 AntDivCfg; 0:OFF , 1:ON, 2:by efuse */
- /* PSTA_INFO_T RSSI_target; */
+ /* struct sta_info *RSSI_target; */
bool *pbDriverStopped;
bool *pbDriverIsGoingToPnpSetPowerSleep;
diff --git a/drivers/staging/rtl8723bs/hal/odm_HWConfig.c b/drivers/staging/rtl8723bs/hal/odm_HWConfig.c
index 994b8c578e7a..5bb27b872052 100644
--- a/drivers/staging/rtl8723bs/hal/odm_HWConfig.c
+++ b/drivers/staging/rtl8723bs/hal/odm_HWConfig.c
@@ -256,7 +256,7 @@ static void odm_Process_RSSIForDM(
u8 RSSI_max, RSSI_min, i;
u32 OFDM_pkt = 0;
u32 Weighting = 0;
- PSTA_INFO_T pEntry;
+ struct sta_info *pEntry;
if (pPktinfo->station_id == 0xFF)
diff --git a/drivers/staging/rtl8723bs/hal/odm_types.h b/drivers/staging/rtl8723bs/hal/odm_types.h
index 8168dc14e879..893fa87852d8 100644
--- a/drivers/staging/rtl8723bs/hal/odm_types.h
+++ b/drivers/staging/rtl8723bs/hal/odm_types.h
@@ -33,9 +33,6 @@ enum hal_status {
#define ODM_ENDIAN_TYPE ODM_ENDIAN_BIG
#endif
- #define STA_INFO_T struct sta_info
- #define PSTA_INFO_T struct sta_info *
-
#define SET_TX_DESC_ANTSEL_A_88E(__pTxDesc, __Value) SET_BITS_TO_LE_4BYTE(__pTxDesc+8, 24, 1, __Value)
#define SET_TX_DESC_ANTSEL_B_88E(__pTxDesc, __Value) SET_BITS_TO_LE_4BYTE(__pTxDesc+8, 25, 1, __Value)
#define SET_TX_DESC_ANTSEL_C_88E(__pTxDesc, __Value) SET_BITS_TO_LE_4BYTE(__pTxDesc+28, 29, 1, __Value)
--
2.52.0
next prev parent reply other threads:[~2026-02-02 7:08 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-02-02 7:07 [PATCH v1 0/5] staging: rtl8723bs: code cleanup and style fixes Luka Gejak
2026-02-02 7:07 ` [PATCH v1 1/5] staging: rtl8723bs: remove unused code for other Realtek chips Luka Gejak
2026-02-02 8:36 ` Greg Kroah-Hartman
2026-02-02 7:07 ` Luka Gejak [this message]
2026-02-02 7:07 ` [PATCH v1 3/5] staging: rtl8723bs: remove NDIS type aliases Luka Gejak
2026-02-02 7:07 ` [PATCH v1 4/5] staging: rtl8723bs: remove redundant MAC_ARG macro Luka Gejak
2026-02-02 7:07 ` [PATCH v1 5/5] staging: rtl8723bs: fix LONG_LINE warnings across C files Luka Gejak
2026-02-02 8:35 ` Greg Kroah-Hartman
2026-02-02 8:36 ` Greg Kroah-Hartman
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=20260202070752.3391-3-lukagejak5@gmail.com \
--to=lukagejak5@gmail.com \
--cc=dan.carpenter@linaro.org \
--cc=gregkh@linuxfoundation.org \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox