From: Nikolay Kulikov <nikolayof23@gmail.com>
To: gregkh@linuxfoundation.org
Cc: linux-staging@lists.linux.dev, Nikolay Kulikov <nikolayof23@gmail.com>
Subject: [PATCH 08/11] staging: rtl8723bs: remove wrapper rtw_hal_disable_interrupt()
Date: Sun, 19 Apr 2026 10:19:34 +0300 [thread overview]
Message-ID: <20260419072034.19824-9-nikolayof23@gmail.com> (raw)
In-Reply-To: <20260419072034.19824-1-nikolayof23@gmail.com>
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
next prev parent reply other threads:[~2026-04-19 7:22 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
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 ` [PATCH 03/11] staging: rtl8723bs: remove wrapper rtw_hal_read_chip_version() Nikolay Kulikov
2026-04-19 7:19 ` [PATCH 04/11] staging: rtl8723bs: remove wrapper rtw_hal_def_value_init() Nikolay Kulikov
2026-04-19 7:19 ` [PATCH 05/11] staging: rtl8723bs: remove wrapper rtw_hal_free_data() Nikolay Kulikov
2026-04-19 7:19 ` [PATCH 06/11] staging: rtl8723bs: remove wrapper rtw_hal_dm_init() Nikolay Kulikov
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 [this message]
2026-04-19 7:19 ` [PATCH 09/11] staging: rtl8723bs: rename ReadAdapterInfo8723BS() to snake_case 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
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=20260419072034.19824-9-nikolayof23@gmail.com \
--to=nikolayof23@gmail.com \
--cc=gregkh@linuxfoundation.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