* [PATCH 01/11] staging: rtl8723bs: remove wrapper rtw_hal_chip_configure()
2026-04-19 7:19 [PATCH 00/11] staging: rtl8723bs: cleanup hal/hal_intf.c Nikolay Kulikov
@ 2026-04-19 7:19 ` Nikolay Kulikov
2026-04-19 7:19 ` [PATCH 02/11] staging: rtl8723bs: remove wrapper rtw_hal_read_chip_info() Nikolay Kulikov
` (9 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Nikolay Kulikov @ 2026-04-19 7:19 UTC (permalink / raw)
To: gregkh; +Cc: linux-staging, Nikolay Kulikov
Remove the rtw_hal_chip_configure() function, as it's just a wrapper
that calls rtl8723bs_interface_configure() directly. Instead, call
rtl8723bs_interface_configure() from the appropriate places. This will
reduce code complexity and improve readability by removing unnecessary
abstraction.
Signed-off-by: Nikolay Kulikov <nikolayof23@gmail.com>
---
drivers/staging/rtl8723bs/hal/hal_intf.c | 5 -----
drivers/staging/rtl8723bs/include/hal_intf.h | 1 -
drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 3 ++-
3 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/rtl8723bs/hal/hal_intf.c b/drivers/staging/rtl8723bs/hal/hal_intf.c
index 27c0c0198714..491208431396 100644
--- a/drivers/staging/rtl8723bs/hal/hal_intf.c
+++ b/drivers/staging/rtl8723bs/hal/hal_intf.c
@@ -7,11 +7,6 @@
#include <drv_types.h>
#include <hal_data.h>
-void rtw_hal_chip_configure(struct adapter *padapter)
-{
- rtl8723bs_interface_configure(padapter);
-}
-
void rtw_hal_read_chip_info(struct adapter *padapter)
{
ReadAdapterInfo8723BS(padapter);
diff --git a/drivers/staging/rtl8723bs/include/hal_intf.h b/drivers/staging/rtl8723bs/include/hal_intf.h
index b193854bfe6e..7629cef95b06 100644
--- a/drivers/staging/rtl8723bs/include/hal_intf.h
+++ b/drivers/staging/rtl8723bs/include/hal_intf.h
@@ -195,7 +195,6 @@ void rtw_hal_get_hwreg(struct adapter *padapter, u8 variable, u8 *val);
void rtw_hal_set_hwreg_with_buf(struct adapter *padapter, u8 variable, u8 *pbuf, int len);
-void rtw_hal_chip_configure(struct adapter *padapter);
void rtw_hal_read_chip_info(struct adapter *padapter);
void rtw_hal_read_chip_version(struct adapter *padapter);
diff --git a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
index d0feb28b7043..f733692784bb 100644
--- a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
+++ b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
@@ -6,6 +6,7 @@
******************************************************************************/
#include <drv_types.h>
#include <hal_btcoex.h>
+#include <hal_data.h>
#include <linux/jiffies.h>
#ifndef dev_to_sdio_func
@@ -265,7 +266,7 @@ static struct adapter *rtw_sdio_if1_init(struct dvobj_priv *dvobj, const struct
rtw_hal_read_chip_version(padapter);
- rtw_hal_chip_configure(padapter);
+ rtl8723bs_interface_configure(padapter);
hal_btcoex_Initialize((void *)padapter);
--
2.53.0
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 02/11] staging: rtl8723bs: remove wrapper rtw_hal_read_chip_info()
2026-04-19 7:19 [PATCH 00/11] staging: rtl8723bs: cleanup hal/hal_intf.c Nikolay Kulikov
2026-04-19 7:19 ` [PATCH 01/11] staging: rtl8723bs: remove wrapper rtw_hal_chip_configure() Nikolay Kulikov
@ 2026-04-19 7:19 ` Nikolay Kulikov
2026-04-19 7:19 ` [PATCH 03/11] staging: rtl8723bs: remove wrapper rtw_hal_read_chip_version() Nikolay Kulikov
` (8 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Nikolay Kulikov @ 2026-04-19 7:19 UTC (permalink / raw)
To: gregkh; +Cc: linux-staging, Nikolay Kulikov
Remove the rtw_hal_read_chip_info() function, as it's just a wrapper
that calls ReadAdapterInfo8723BS() directly. Replace all its calls to
the ReadAdapterInfo8723BS() function. This will remove an extra level of
abstraction and simplify the code.
Signed-off-by: Nikolay Kulikov <nikolayof23@gmail.com>
---
drivers/staging/rtl8723bs/hal/hal_intf.c | 5 -----
drivers/staging/rtl8723bs/include/hal_intf.h | 1 -
drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 2 +-
3 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/drivers/staging/rtl8723bs/hal/hal_intf.c b/drivers/staging/rtl8723bs/hal/hal_intf.c
index 491208431396..da250179fc92 100644
--- a/drivers/staging/rtl8723bs/hal/hal_intf.c
+++ b/drivers/staging/rtl8723bs/hal/hal_intf.c
@@ -7,11 +7,6 @@
#include <drv_types.h>
#include <hal_data.h>
-void rtw_hal_read_chip_info(struct adapter *padapter)
-{
- ReadAdapterInfo8723BS(padapter);
-}
-
void rtw_hal_read_chip_version(struct adapter *padapter)
{
rtl8723b_read_chip_version(padapter);
diff --git a/drivers/staging/rtl8723bs/include/hal_intf.h b/drivers/staging/rtl8723bs/include/hal_intf.h
index 7629cef95b06..8f5f2c63fc10 100644
--- a/drivers/staging/rtl8723bs/include/hal_intf.h
+++ b/drivers/staging/rtl8723bs/include/hal_intf.h
@@ -195,7 +195,6 @@ void rtw_hal_get_hwreg(struct adapter *padapter, u8 variable, u8 *val);
void rtw_hal_set_hwreg_with_buf(struct adapter *padapter, u8 variable, u8 *pbuf, int len);
-void rtw_hal_read_chip_info(struct adapter *padapter);
void rtw_hal_read_chip_version(struct adapter *padapter);
u8 rtw_hal_get_def_var(struct adapter *padapter, enum hal_def_variable eVariable, void *pValue);
diff --git a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
index f733692784bb..98eff17be9b6 100644
--- a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
+++ b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
@@ -271,7 +271,7 @@ static struct adapter *rtw_sdio_if1_init(struct dvobj_priv *dvobj, const struct
hal_btcoex_Initialize((void *)padapter);
/* 3 6. read efuse/eeprom data */
- rtw_hal_read_chip_info(padapter);
+ ReadAdapterInfo8723BS(padapter);
/* 3 7. init driver common data */
if (rtw_init_drv_sw(padapter) == _FAIL)
--
2.53.0
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 03/11] staging: rtl8723bs: remove wrapper rtw_hal_read_chip_version()
2026-04-19 7:19 [PATCH 00/11] staging: rtl8723bs: cleanup hal/hal_intf.c Nikolay Kulikov
2026-04-19 7:19 ` [PATCH 01/11] staging: rtl8723bs: remove wrapper rtw_hal_chip_configure() Nikolay Kulikov
2026-04-19 7:19 ` [PATCH 02/11] staging: rtl8723bs: remove wrapper rtw_hal_read_chip_info() Nikolay Kulikov
@ 2026-04-19 7:19 ` Nikolay Kulikov
2026-04-19 7:19 ` [PATCH 04/11] staging: rtl8723bs: remove wrapper rtw_hal_def_value_init() Nikolay Kulikov
` (7 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Nikolay Kulikov @ 2026-04-19 7:19 UTC (permalink / raw)
To: gregkh; +Cc: linux-staging, Nikolay Kulikov
Remove rtw_hal_read_chip_version() function, as it's just a wrapper
that calls rtl8723b_read_chip_version() directly. Replace all its calls
to the rtl8723b_read_chip_version(). This will remove an extra level of
abstraction and simplify the code.
Signed-off-by: Nikolay Kulikov <nikolayof23@gmail.com>
---
drivers/staging/rtl8723bs/hal/hal_intf.c | 5 -----
drivers/staging/rtl8723bs/include/hal_intf.h | 2 --
drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 2 +-
3 files changed, 1 insertion(+), 8 deletions(-)
diff --git a/drivers/staging/rtl8723bs/hal/hal_intf.c b/drivers/staging/rtl8723bs/hal/hal_intf.c
index da250179fc92..c3a238cb0b1e 100644
--- a/drivers/staging/rtl8723bs/hal/hal_intf.c
+++ b/drivers/staging/rtl8723bs/hal/hal_intf.c
@@ -7,11 +7,6 @@
#include <drv_types.h>
#include <hal_data.h>
-void rtw_hal_read_chip_version(struct adapter *padapter)
-{
- rtl8723b_read_chip_version(padapter);
-}
-
void rtw_hal_def_value_init(struct adapter *padapter)
{
rtl8723bs_init_default_value(padapter);
diff --git a/drivers/staging/rtl8723bs/include/hal_intf.h b/drivers/staging/rtl8723bs/include/hal_intf.h
index 8f5f2c63fc10..0d2f60ce29af 100644
--- a/drivers/staging/rtl8723bs/include/hal_intf.h
+++ b/drivers/staging/rtl8723bs/include/hal_intf.h
@@ -195,8 +195,6 @@ void rtw_hal_get_hwreg(struct adapter *padapter, u8 variable, u8 *val);
void rtw_hal_set_hwreg_with_buf(struct adapter *padapter, u8 variable, u8 *pbuf, int len);
-void rtw_hal_read_chip_version(struct adapter *padapter);
-
u8 rtw_hal_get_def_var(struct adapter *padapter, enum hal_def_variable eVariable, void *pValue);
void rtw_hal_set_odm_var(struct adapter *padapter, enum hal_odm_variable eVariable, void *pValue1, bool bSet);
diff --git a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
index 98eff17be9b6..e487e238d737 100644
--- a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
+++ b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
@@ -264,7 +264,7 @@ static struct adapter *rtw_sdio_if1_init(struct dvobj_priv *dvobj, const struct
if (rtw_init_io_priv(padapter, sdio_set_intf_ops) == _FAIL)
goto free_hal_data;
- rtw_hal_read_chip_version(padapter);
+ rtl8723b_read_chip_version(padapter);
rtl8723bs_interface_configure(padapter);
--
2.53.0
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 04/11] staging: rtl8723bs: remove wrapper rtw_hal_def_value_init()
2026-04-19 7:19 [PATCH 00/11] staging: rtl8723bs: cleanup hal/hal_intf.c Nikolay Kulikov
` (2 preceding siblings ...)
2026-04-19 7:19 ` [PATCH 03/11] staging: rtl8723bs: remove wrapper rtw_hal_read_chip_version() Nikolay Kulikov
@ 2026-04-19 7:19 ` Nikolay Kulikov
2026-04-19 7:19 ` [PATCH 05/11] staging: rtl8723bs: remove wrapper rtw_hal_free_data() Nikolay Kulikov
` (6 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Nikolay Kulikov @ 2026-04-19 7:19 UTC (permalink / raw)
To: gregkh; +Cc: linux-staging, Nikolay Kulikov
Remove unnecessary wrapper and call rtl8723bs_init_default_value()
function directly to simplify code.
Signed-off-by: Nikolay Kulikov <nikolayof23@gmail.com>
---
drivers/staging/rtl8723bs/hal/hal_intf.c | 5 -----
drivers/staging/rtl8723bs/include/hal_intf.h | 2 --
drivers/staging/rtl8723bs/os_dep/os_intfs.c | 4 ++--
3 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/drivers/staging/rtl8723bs/hal/hal_intf.c b/drivers/staging/rtl8723bs/hal/hal_intf.c
index c3a238cb0b1e..1322713fec6c 100644
--- a/drivers/staging/rtl8723bs/hal/hal_intf.c
+++ b/drivers/staging/rtl8723bs/hal/hal_intf.c
@@ -7,11 +7,6 @@
#include <drv_types.h>
#include <hal_data.h>
-void rtw_hal_def_value_init(struct adapter *padapter)
-{
- rtl8723bs_init_default_value(padapter);
-}
-
void rtw_hal_free_data(struct adapter *padapter)
{
/* free HAL Data */
diff --git a/drivers/staging/rtl8723bs/include/hal_intf.h b/drivers/staging/rtl8723bs/include/hal_intf.h
index 0d2f60ce29af..f46989ce9e3b 100644
--- a/drivers/staging/rtl8723bs/include/hal_intf.h
+++ b/drivers/staging/rtl8723bs/include/hal_intf.h
@@ -181,8 +181,6 @@ typedef s32 (*c2h_id_filter)(u8 *c2h_evt);
#define RX_PNOWakeUp 0x55
#define AP_WakeUp 0x66
-void rtw_hal_def_value_init(struct adapter *padapter);
-
void rtw_hal_free_data(struct adapter *padapter);
void rtw_hal_dm_init(struct adapter *padapter);
diff --git a/drivers/staging/rtl8723bs/os_dep/os_intfs.c b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
index e943dcea1a21..0685ed17a39f 100644
--- a/drivers/staging/rtl8723bs/os_dep/os_intfs.c
+++ b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
@@ -550,7 +550,7 @@ static void rtw_init_default_value(struct adapter *padapter)
rtw_update_registrypriv_dev_network(padapter);
/* hal_priv */
- rtw_hal_def_value_init(padapter);
+ rtl8723bs_init_default_value(padapter);
/* misc. */
RTW_ENABLE_FUNC(padapter, DF_RX_BIT);
@@ -609,7 +609,7 @@ void rtw_reset_drv_sw(struct adapter *padapter)
struct pwrctrl_priv *pwrctrlpriv = adapter_to_pwrctl(padapter);
/* hal_priv */
- rtw_hal_def_value_init(padapter);
+ rtl8723bs_init_default_value(padapter);
RTW_ENABLE_FUNC(padapter, DF_RX_BIT);
RTW_ENABLE_FUNC(padapter, DF_TX_BIT);
--
2.53.0
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 05/11] staging: rtl8723bs: remove wrapper rtw_hal_free_data()
2026-04-19 7:19 [PATCH 00/11] staging: rtl8723bs: cleanup hal/hal_intf.c Nikolay Kulikov
` (3 preceding siblings ...)
2026-04-19 7:19 ` [PATCH 04/11] staging: rtl8723bs: remove wrapper rtw_hal_def_value_init() Nikolay Kulikov
@ 2026-04-19 7:19 ` Nikolay Kulikov
2026-04-19 7:19 ` [PATCH 06/11] staging: rtl8723bs: remove wrapper rtw_hal_dm_init() Nikolay Kulikov
` (5 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Nikolay Kulikov @ 2026-04-19 7:19 UTC (permalink / raw)
To: gregkh; +Cc: linux-staging, Nikolay Kulikov
Remove unnecessary wrapper and call rtw_hal_data_deinit() function
directly to simplify code.
Signed-off-by: Nikolay Kulikov <nikolayof23@gmail.com>
---
drivers/staging/rtl8723bs/hal/hal_intf.c | 6 ------
drivers/staging/rtl8723bs/include/hal_intf.h | 2 --
drivers/staging/rtl8723bs/os_dep/os_intfs.c | 2 +-
3 files changed, 1 insertion(+), 9 deletions(-)
diff --git a/drivers/staging/rtl8723bs/hal/hal_intf.c b/drivers/staging/rtl8723bs/hal/hal_intf.c
index 1322713fec6c..43b9bf9712c8 100644
--- a/drivers/staging/rtl8723bs/hal/hal_intf.c
+++ b/drivers/staging/rtl8723bs/hal/hal_intf.c
@@ -7,12 +7,6 @@
#include <drv_types.h>
#include <hal_data.h>
-void rtw_hal_free_data(struct adapter *padapter)
-{
- /* free HAL Data */
- rtw_hal_data_deinit(padapter);
-}
-
void rtw_hal_dm_init(struct adapter *padapter)
{
rtl8723b_init_dm_priv(padapter);
diff --git a/drivers/staging/rtl8723bs/include/hal_intf.h b/drivers/staging/rtl8723bs/include/hal_intf.h
index f46989ce9e3b..e7cfb255f8f6 100644
--- a/drivers/staging/rtl8723bs/include/hal_intf.h
+++ b/drivers/staging/rtl8723bs/include/hal_intf.h
@@ -181,8 +181,6 @@ typedef s32 (*c2h_id_filter)(u8 *c2h_evt);
#define RX_PNOWakeUp 0x55
#define AP_WakeUp 0x66
-void rtw_hal_free_data(struct adapter *padapter);
-
void rtw_hal_dm_init(struct adapter *padapter);
uint rtw_hal_init(struct adapter *padapter);
diff --git a/drivers/staging/rtl8723bs/os_dep/os_intfs.c b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
index 0685ed17a39f..bd42795fb1a2 100644
--- a/drivers/staging/rtl8723bs/os_dep/os_intfs.c
+++ b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
@@ -734,7 +734,7 @@ u8 rtw_free_drv_sw(struct adapter *padapter)
/* kfree((void *)padapter); */
- rtw_hal_free_data(padapter);
+ rtw_hal_data_deinit(padapter);
/* free the old_pnetdev */
if (padapter->rereg_nd_name_priv.old_pnetdev) {
--
2.53.0
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 06/11] staging: rtl8723bs: remove wrapper rtw_hal_dm_init()
2026-04-19 7:19 [PATCH 00/11] staging: rtl8723bs: cleanup hal/hal_intf.c Nikolay Kulikov
` (4 preceding siblings ...)
2026-04-19 7:19 ` [PATCH 05/11] staging: rtl8723bs: remove wrapper rtw_hal_free_data() Nikolay Kulikov
@ 2026-04-19 7:19 ` Nikolay Kulikov
2026-04-19 7:19 ` [PATCH 07/11] staging: rtl8723bs: remove wrapper rtw_hal_enable_interrupt() Nikolay Kulikov
` (4 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Nikolay Kulikov @ 2026-04-19 7:19 UTC (permalink / raw)
To: gregkh; +Cc: linux-staging, Nikolay Kulikov
Remove unnecessary wrapper and call rtl8723b_init_dm_priv() function
directly to simplify code.
Signed-off-by: Nikolay Kulikov <nikolayof23@gmail.com>
---
drivers/staging/rtl8723bs/hal/hal_intf.c | 5 -----
drivers/staging/rtl8723bs/include/hal_intf.h | 2 --
drivers/staging/rtl8723bs/os_dep/os_intfs.c | 2 +-
3 files changed, 1 insertion(+), 8 deletions(-)
diff --git a/drivers/staging/rtl8723bs/hal/hal_intf.c b/drivers/staging/rtl8723bs/hal/hal_intf.c
index 43b9bf9712c8..4448082c14da 100644
--- a/drivers/staging/rtl8723bs/hal/hal_intf.c
+++ b/drivers/staging/rtl8723bs/hal/hal_intf.c
@@ -7,11 +7,6 @@
#include <drv_types.h>
#include <hal_data.h>
-void rtw_hal_dm_init(struct adapter *padapter)
-{
- rtl8723b_init_dm_priv(padapter);
-}
-
static void rtw_hal_init_opmode(struct adapter *padapter)
{
enum ndis_802_11_network_infrastructure networkType = Ndis802_11InfrastructureMax;
diff --git a/drivers/staging/rtl8723bs/include/hal_intf.h b/drivers/staging/rtl8723bs/include/hal_intf.h
index e7cfb255f8f6..721501ca3b02 100644
--- a/drivers/staging/rtl8723bs/include/hal_intf.h
+++ b/drivers/staging/rtl8723bs/include/hal_intf.h
@@ -181,8 +181,6 @@ typedef s32 (*c2h_id_filter)(u8 *c2h_evt);
#define RX_PNOWakeUp 0x55
#define AP_WakeUp 0x66
-void rtw_hal_dm_init(struct adapter *padapter);
-
uint rtw_hal_init(struct adapter *padapter);
uint rtw_hal_deinit(struct adapter *padapter);
void rtw_hal_stop(struct adapter *padapter);
diff --git a/drivers/staging/rtl8723bs/os_dep/os_intfs.c b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
index bd42795fb1a2..0467c87619ca 100644
--- a/drivers/staging/rtl8723bs/os_dep/os_intfs.c
+++ b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
@@ -674,7 +674,7 @@ u8 rtw_init_drv_sw(struct adapter *padapter)
rtw_init_pwrctrl_priv(padapter);
- rtw_hal_dm_init(padapter);
+ rtl8723b_init_dm_priv(padapter);
return _SUCCESS;
--
2.53.0
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 07/11] staging: rtl8723bs: remove wrapper rtw_hal_enable_interrupt()
2026-04-19 7:19 [PATCH 00/11] staging: rtl8723bs: cleanup hal/hal_intf.c Nikolay Kulikov
` (5 preceding siblings ...)
2026-04-19 7:19 ` [PATCH 06/11] staging: rtl8723bs: remove wrapper rtw_hal_dm_init() Nikolay Kulikov
@ 2026-04-19 7:19 ` Nikolay Kulikov
2026-04-19 7:19 ` [PATCH 08/11] staging: rtl8723bs: remove wrapper rtw_hal_disable_interrupt() Nikolay Kulikov
` (3 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Nikolay Kulikov @ 2026-04-19 7:19 UTC (permalink / raw)
To: gregkh; +Cc: linux-staging, Nikolay Kulikov
Remove unnecessary wrapper and call EnableInterrupt8723BSdio() function
directly to simplify code.
Signed-off-by: Nikolay Kulikov <nikolayof23@gmail.com>
---
drivers/staging/rtl8723bs/hal/hal_intf.c | 5 -----
drivers/staging/rtl8723bs/include/hal_intf.h | 1 -
drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 3 +--
3 files changed, 1 insertion(+), 8 deletions(-)
diff --git a/drivers/staging/rtl8723bs/hal/hal_intf.c b/drivers/staging/rtl8723bs/hal/hal_intf.c
index 4448082c14da..529648036f58 100644
--- a/drivers/staging/rtl8723bs/hal/hal_intf.c
+++ b/drivers/staging/rtl8723bs/hal/hal_intf.c
@@ -94,11 +94,6 @@ void rtw_hal_set_odm_var(struct adapter *padapter, enum hal_odm_variable eVariab
SetHalODMVar(padapter, eVariable, pValue1, bSet);
}
-void rtw_hal_enable_interrupt(struct adapter *padapter)
-{
- EnableInterrupt8723BSdio(padapter);
-}
-
void rtw_hal_disable_interrupt(struct adapter *padapter)
{
DisableInterrupt8723BSdio(padapter);
diff --git a/drivers/staging/rtl8723bs/include/hal_intf.h b/drivers/staging/rtl8723bs/include/hal_intf.h
index 721501ca3b02..6af2337822ff 100644
--- a/drivers/staging/rtl8723bs/include/hal_intf.h
+++ b/drivers/staging/rtl8723bs/include/hal_intf.h
@@ -193,7 +193,6 @@ u8 rtw_hal_get_def_var(struct adapter *padapter, enum hal_def_variable eVariable
void rtw_hal_set_odm_var(struct adapter *padapter, enum hal_odm_variable eVariable, void *pValue1, bool bSet);
-void rtw_hal_enable_interrupt(struct adapter *padapter);
void rtw_hal_disable_interrupt(struct adapter *padapter);
u8 rtw_hal_check_ips_status(struct adapter *padapter);
diff --git a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
index e487e238d737..2e573a0a255e 100644
--- a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
+++ b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
@@ -204,8 +204,7 @@ static void sd_intf_start(struct adapter *padapter)
if (!padapter)
return;
- /* hal dep */
- rtw_hal_enable_interrupt(padapter);
+ EnableInterrupt8723BSdio(padapter);
}
static void sd_intf_stop(struct adapter *padapter)
--
2.53.0
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 08/11] staging: rtl8723bs: remove wrapper rtw_hal_disable_interrupt()
2026-04-19 7:19 [PATCH 00/11] staging: rtl8723bs: cleanup hal/hal_intf.c Nikolay Kulikov
` (6 preceding siblings ...)
2026-04-19 7:19 ` [PATCH 07/11] staging: rtl8723bs: remove wrapper rtw_hal_enable_interrupt() Nikolay Kulikov
@ 2026-04-19 7:19 ` Nikolay Kulikov
2026-04-19 7:19 ` [PATCH 09/11] staging: rtl8723bs: rename ReadAdapterInfo8723BS() to snake_case Nikolay Kulikov
` (2 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Nikolay Kulikov @ 2026-04-19 7:19 UTC (permalink / raw)
To: gregkh; +Cc: linux-staging, Nikolay Kulikov
Remove unnecessary wrapper and call DisableInterrupt8723BSdio() function
directly to simplify the code.
Signed-off-by: Nikolay Kulikov <nikolayof23@gmail.com>
---
drivers/staging/rtl8723bs/hal/hal_intf.c | 5 -----
drivers/staging/rtl8723bs/hal/sdio_halinit.c | 3 ---
drivers/staging/rtl8723bs/include/hal_intf.h | 2 --
drivers/staging/rtl8723bs/os_dep/os_intfs.c | 2 +-
drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 5 ++---
5 files changed, 3 insertions(+), 14 deletions(-)
diff --git a/drivers/staging/rtl8723bs/hal/hal_intf.c b/drivers/staging/rtl8723bs/hal/hal_intf.c
index 529648036f58..f75b8a8192b8 100644
--- a/drivers/staging/rtl8723bs/hal/hal_intf.c
+++ b/drivers/staging/rtl8723bs/hal/hal_intf.c
@@ -94,11 +94,6 @@ void rtw_hal_set_odm_var(struct adapter *padapter, enum hal_odm_variable eVariab
SetHalODMVar(padapter, eVariable, pValue1, bSet);
}
-void rtw_hal_disable_interrupt(struct adapter *padapter)
-{
- DisableInterrupt8723BSdio(padapter);
-}
-
u8 rtw_hal_check_ips_status(struct adapter *padapter)
{
return CheckIPSStatus(padapter);
diff --git a/drivers/staging/rtl8723bs/hal/sdio_halinit.c b/drivers/staging/rtl8723bs/hal/sdio_halinit.c
index f2f73c65a636..20632a28d818 100644
--- a/drivers/staging/rtl8723bs/hal/sdio_halinit.c
+++ b/drivers/staging/rtl8723bs/hal/sdio_halinit.c
@@ -640,9 +640,6 @@ u32 rtl8723bs_hal_init(struct adapter *padapter)
return _SUCCESS;
}
- /* Disable Interrupt first. */
-/* rtw_hal_disable_interrupt(padapter); */
-
ret = _InitPowerOn_8723BS(padapter);
if (ret == _FAIL)
return _FAIL;
diff --git a/drivers/staging/rtl8723bs/include/hal_intf.h b/drivers/staging/rtl8723bs/include/hal_intf.h
index 6af2337822ff..1d62ea71a890 100644
--- a/drivers/staging/rtl8723bs/include/hal_intf.h
+++ b/drivers/staging/rtl8723bs/include/hal_intf.h
@@ -193,8 +193,6 @@ u8 rtw_hal_get_def_var(struct adapter *padapter, enum hal_def_variable eVariable
void rtw_hal_set_odm_var(struct adapter *padapter, enum hal_odm_variable eVariable, void *pValue1, bool bSet);
-void rtw_hal_disable_interrupt(struct adapter *padapter);
-
u8 rtw_hal_check_ips_status(struct adapter *padapter);
s32 rtw_hal_xmitframe_enqueue(struct adapter *padapter, struct xmit_frame *pxmitframe);
diff --git a/drivers/staging/rtl8723bs/os_dep/os_intfs.c b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
index 0467c87619ca..f9995e02485e 100644
--- a/drivers/staging/rtl8723bs/os_dep/os_intfs.c
+++ b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
@@ -1140,7 +1140,7 @@ static int rtw_resume_process_normal(struct adapter *padapter)
if (ret)
goto exit;
}
- rtw_hal_disable_interrupt(padapter);
+ DisableInterrupt8723BSdio(padapter);
/* if (sdio_alloc_irq(adapter_to_dvobj(padapter)) != _SUCCESS) */
if ((padapter->intf_alloc_irq) && (padapter->intf_alloc_irq(adapter_to_dvobj(padapter)) != _SUCCESS)) {
ret = -1;
diff --git a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
index 2e573a0a255e..0574258a0cec 100644
--- a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
+++ b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
@@ -212,8 +212,7 @@ static void sd_intf_stop(struct adapter *padapter)
if (!padapter)
return;
- /* hal dep */
- rtw_hal_disable_interrupt(padapter);
+ DisableInterrupt8723BSdio(padapter);
}
@@ -282,7 +281,7 @@ static struct adapter *rtw_sdio_if1_init(struct dvobj_priv *dvobj, const struct
/* set mac addr */
rtw_macaddr_cfg(&psdio->func->dev, padapter->eeprompriv.mac_addr);
- rtw_hal_disable_interrupt(padapter);
+ DisableInterrupt8723BSdio(padapter);
status = _SUCCESS;
--
2.53.0
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 09/11] staging: rtl8723bs: rename ReadAdapterInfo8723BS() to snake_case
2026-04-19 7:19 [PATCH 00/11] staging: rtl8723bs: cleanup hal/hal_intf.c Nikolay Kulikov
` (7 preceding siblings ...)
2026-04-19 7:19 ` [PATCH 08/11] staging: rtl8723bs: remove wrapper rtw_hal_disable_interrupt() Nikolay Kulikov
@ 2026-04-19 7:19 ` Nikolay Kulikov
2026-04-19 7:19 ` [PATCH 10/11] staging: rtl8723bs: rename EnableInterrupt8723BSdio() " Nikolay Kulikov
2026-04-19 7:19 ` [PATCH 11/11] staging: rtl8723bs: rename DisableInterrupt8723BSdio() " Nikolay Kulikov
10 siblings, 0 replies; 12+ messages in thread
From: Nikolay Kulikov @ 2026-04-19 7:19 UTC (permalink / raw)
To: gregkh; +Cc: linux-staging, Nikolay Kulikov
Rename function ReadAdapterInfo8723BS() to rtw_read_adapter_info() to
comply with Linux kernel coding style and fix checkpatch.pl warning.
Signed-off-by: Nikolay Kulikov <nikolayof23@gmail.com>
---
drivers/staging/rtl8723bs/hal/sdio_halinit.c | 2 +-
drivers/staging/rtl8723bs/include/rtl8723b_recv.h | 2 +-
drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/rtl8723bs/hal/sdio_halinit.c b/drivers/staging/rtl8723bs/hal/sdio_halinit.c
index 20632a28d818..93ea9bf78626 100644
--- a/drivers/staging/rtl8723bs/hal/sdio_halinit.c
+++ b/drivers/staging/rtl8723bs/hal/sdio_halinit.c
@@ -1115,7 +1115,7 @@ static s32 _ReadAdapterInfo8723BS(struct adapter *padapter)
return _SUCCESS;
}
-void ReadAdapterInfo8723BS(struct adapter *padapter)
+void rtw_read_adapter_info(struct adapter *padapter)
{
/* Read EEPROM size before call any EEPROM function */
padapter->EepromAddressSize = GetEEPROMSize8723B(padapter);
diff --git a/drivers/staging/rtl8723bs/include/rtl8723b_recv.h b/drivers/staging/rtl8723bs/include/rtl8723b_recv.h
index 783f64de0aec..e9ebecb224a6 100644
--- a/drivers/staging/rtl8723bs/include/rtl8723b_recv.h
+++ b/drivers/staging/rtl8723bs/include/rtl8723b_recv.h
@@ -90,6 +90,6 @@ void rtl8723b_process_phy_info(struct adapter *padapter, void *prframe);
void rtl8723b_read_chip_version(struct adapter *padapter);
void rtl8723bs_init_default_value(struct adapter *padapter);
void rtl8723bs_interface_configure(struct adapter *padapter);
-void ReadAdapterInfo8723BS(struct adapter *padapter);
+void rtw_read_adapter_info(struct adapter *padapter);
#endif
diff --git a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
index 0574258a0cec..a462a2864a59 100644
--- a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
+++ b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
@@ -269,7 +269,7 @@ static struct adapter *rtw_sdio_if1_init(struct dvobj_priv *dvobj, const struct
hal_btcoex_Initialize((void *)padapter);
/* 3 6. read efuse/eeprom data */
- ReadAdapterInfo8723BS(padapter);
+ rtw_read_adapter_info(padapter);
/* 3 7. init driver common data */
if (rtw_init_drv_sw(padapter) == _FAIL)
--
2.53.0
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 10/11] staging: rtl8723bs: rename EnableInterrupt8723BSdio() to snake_case
2026-04-19 7:19 [PATCH 00/11] staging: rtl8723bs: cleanup hal/hal_intf.c Nikolay Kulikov
` (8 preceding siblings ...)
2026-04-19 7:19 ` [PATCH 09/11] staging: rtl8723bs: rename ReadAdapterInfo8723BS() to snake_case Nikolay Kulikov
@ 2026-04-19 7:19 ` Nikolay Kulikov
2026-04-19 7:19 ` [PATCH 11/11] staging: rtl8723bs: rename DisableInterrupt8723BSdio() " Nikolay Kulikov
10 siblings, 0 replies; 12+ messages in thread
From: Nikolay Kulikov @ 2026-04-19 7:19 UTC (permalink / raw)
To: gregkh; +Cc: linux-staging, Nikolay Kulikov
Rename function EnableInterrupt8723BSdio() to
rtw_sdio_enable_interrupt() and format its description to comply with
Linux kernel coding style.
Declare this function without 'extern' prototype in the .h file to fix
checkpatch.pl warning.
Signed-off-by: Nikolay Kulikov <nikolayof23@gmail.com>
---
drivers/staging/rtl8723bs/hal/sdio_ops.c | 19 ++++++++-----------
drivers/staging/rtl8723bs/include/sdio_ops.h | 2 +-
drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 2 +-
3 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/drivers/staging/rtl8723bs/hal/sdio_ops.c b/drivers/staging/rtl8723bs/hal/sdio_ops.c
index 8cece69dbf79..0d8d0935e4a2 100644
--- a/drivers/staging/rtl8723bs/hal/sdio_ops.c
+++ b/drivers/staging/rtl8723bs/hal/sdio_ops.c
@@ -712,17 +712,14 @@ void InitSysInterrupt8723BSdio(struct adapter *adapter)
haldata->SysIntrMask = (0);
}
-/* */
-/* Description: */
-/* Enalbe SDIO Host Interrupt Mask configuration on SDIO local domain. */
-/* */
-/* Assumption: */
-/* 1. Using SDIO Local register ONLY for configuration. */
-/* 2. PASSIVE LEVEL */
-/* */
-/* Created by Roger, 2011.02.11. */
-/* */
-void EnableInterrupt8723BSdio(struct adapter *adapter)
+/*
+ * Enable SDIO Host Interrupt Mask configuration on SDIO local domain.
+ *
+ * Assumption:
+ * 1. Using SDIO Local register ONLY for configuration.
+ * 2. PASSIVE LEVEL
+ */
+void rtw_sdio_enable_interrupt(struct adapter *adapter)
{
struct hal_com_data *haldata;
__le32 himr;
diff --git a/drivers/staging/rtl8723bs/include/sdio_ops.h b/drivers/staging/rtl8723bs/include/sdio_ops.h
index c7559a884608..7bb4b2047cc1 100644
--- a/drivers/staging/rtl8723bs/include/sdio_ops.h
+++ b/drivers/staging/rtl8723bs/include/sdio_ops.h
@@ -27,7 +27,7 @@ extern u8 CheckIPSStatus(struct adapter *padapter);
extern void InitInterrupt8723BSdio(struct adapter *padapter);
extern void InitSysInterrupt8723BSdio(struct adapter *padapter);
-extern void EnableInterrupt8723BSdio(struct adapter *padapter);
+void rtw_sdio_enable_interrupt(struct adapter *padapter);
extern void DisableInterrupt8723BSdio(struct adapter *padapter);
extern u8 HalQueryTxBufferStatus8723BSdio(struct adapter *padapter);
extern void HalQueryTxOQTBufferStatus8723BSdio(struct adapter *padapter);
diff --git a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
index a462a2864a59..f6fa51f952e0 100644
--- a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
+++ b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
@@ -204,7 +204,7 @@ static void sd_intf_start(struct adapter *padapter)
if (!padapter)
return;
- EnableInterrupt8723BSdio(padapter);
+ rtw_sdio_enable_interrupt(padapter);
}
static void sd_intf_stop(struct adapter *padapter)
--
2.53.0
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 11/11] staging: rtl8723bs: rename DisableInterrupt8723BSdio() to snake_case
2026-04-19 7:19 [PATCH 00/11] staging: rtl8723bs: cleanup hal/hal_intf.c Nikolay Kulikov
` (9 preceding siblings ...)
2026-04-19 7:19 ` [PATCH 10/11] staging: rtl8723bs: rename EnableInterrupt8723BSdio() " Nikolay Kulikov
@ 2026-04-19 7:19 ` Nikolay Kulikov
10 siblings, 0 replies; 12+ messages in thread
From: Nikolay Kulikov @ 2026-04-19 7:19 UTC (permalink / raw)
To: gregkh; +Cc: linux-staging, Nikolay Kulikov
Rename function DisableInterrupt8723BSdio() to
rtw_sdio_disable_interrupt() and format its description to comply with
Linux kernel coding style.
Declare this function without 'extern' prototype in the .h file to fix
checkpatch.pl warning.
Signed-off-by: Nikolay Kulikov <nikolayof23@gmail.com>
---
drivers/staging/rtl8723bs/hal/sdio_ops.c | 17 +++++++----------
drivers/staging/rtl8723bs/include/sdio_ops.h | 2 +-
drivers/staging/rtl8723bs/os_dep/os_intfs.c | 2 +-
drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 4 ++--
4 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/drivers/staging/rtl8723bs/hal/sdio_ops.c b/drivers/staging/rtl8723bs/hal/sdio_ops.c
index 0d8d0935e4a2..a7713acccce9 100644
--- a/drivers/staging/rtl8723bs/hal/sdio_ops.c
+++ b/drivers/staging/rtl8723bs/hal/sdio_ops.c
@@ -742,16 +742,13 @@ void rtw_sdio_enable_interrupt(struct adapter *adapter)
rtw_write8(adapter, REG_C2HEVT_CLEAR, C2H_EVT_HOST_CLOSE);
}
-/* */
-/* Description: */
-/* Disable SDIO Host IMR configuration to mask unnecessary interrupt service. */
-/* */
-/* Assumption: */
-/* Using SDIO Local register ONLY for configuration. */
-/* */
-/* Created by Roger, 2011.02.11. */
-/* */
-void DisableInterrupt8723BSdio(struct adapter *adapter)
+/*
+ * Disable SDIO Host IMR configuration to mask unnecessary interrupt service.
+ *
+ * Assumption:
+ * Using SDIO Local register ONLY for configuration.
+ */
+void rtw_sdio_disable_interrupt(struct adapter *adapter)
{
__le32 himr;
diff --git a/drivers/staging/rtl8723bs/include/sdio_ops.h b/drivers/staging/rtl8723bs/include/sdio_ops.h
index 7bb4b2047cc1..13f13076bc16 100644
--- a/drivers/staging/rtl8723bs/include/sdio_ops.h
+++ b/drivers/staging/rtl8723bs/include/sdio_ops.h
@@ -28,7 +28,7 @@ extern u8 CheckIPSStatus(struct adapter *padapter);
extern void InitInterrupt8723BSdio(struct adapter *padapter);
extern void InitSysInterrupt8723BSdio(struct adapter *padapter);
void rtw_sdio_enable_interrupt(struct adapter *padapter);
-extern void DisableInterrupt8723BSdio(struct adapter *padapter);
+void rtw_sdio_disable_interrupt(struct adapter *padapter);
extern u8 HalQueryTxBufferStatus8723BSdio(struct adapter *padapter);
extern void HalQueryTxOQTBufferStatus8723BSdio(struct adapter *padapter);
#endif /* !__SDIO_OPS_H__ */
diff --git a/drivers/staging/rtl8723bs/os_dep/os_intfs.c b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
index f9995e02485e..b240b8285995 100644
--- a/drivers/staging/rtl8723bs/os_dep/os_intfs.c
+++ b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
@@ -1140,7 +1140,7 @@ static int rtw_resume_process_normal(struct adapter *padapter)
if (ret)
goto exit;
}
- DisableInterrupt8723BSdio(padapter);
+ rtw_sdio_disable_interrupt(padapter);
/* if (sdio_alloc_irq(adapter_to_dvobj(padapter)) != _SUCCESS) */
if ((padapter->intf_alloc_irq) && (padapter->intf_alloc_irq(adapter_to_dvobj(padapter)) != _SUCCESS)) {
ret = -1;
diff --git a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
index f6fa51f952e0..d6e3a74f2edd 100644
--- a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
+++ b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
@@ -212,7 +212,7 @@ static void sd_intf_stop(struct adapter *padapter)
if (!padapter)
return;
- DisableInterrupt8723BSdio(padapter);
+ rtw_sdio_disable_interrupt(padapter);
}
@@ -281,7 +281,7 @@ static struct adapter *rtw_sdio_if1_init(struct dvobj_priv *dvobj, const struct
/* set mac addr */
rtw_macaddr_cfg(&psdio->func->dev, padapter->eeprompriv.mac_addr);
- DisableInterrupt8723BSdio(padapter);
+ rtw_sdio_disable_interrupt(padapter);
status = _SUCCESS;
--
2.53.0
^ permalink raw reply related [flat|nested] 12+ messages in thread