From: Nikolay Kulikov <nikolayof23@gmail.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-staging@lists.linux.dev, Nikolay Kulikov <nikolayof23@gmail.com>
Subject: [PATCH v2 1/2] staging: rtl8723bs: remove wrapper rtw_hal_disable_interrupt()
Date: Thu, 30 Apr 2026 20:29:05 +0300 [thread overview]
Message-ID: <20260430172954.12828-2-nikolayof23@gmail.com> (raw)
In-Reply-To: <20260430172954.12828-1-nikolayof23@gmail.com>
Remove unnecessary wrapper and call DisableInterrupt8723BSdio() function
directly to simplify the code.
Signed-off-by: Nikolay Kulikov <nikolayof23@gmail.com>
---
Changes in v2:
- rebase on staging-next
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 +-
drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 5 ++---
4 files changed, 3 insertions(+), 11 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/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 b80f1d03ed5a..9270daa018b9 100644
--- a/drivers/staging/rtl8723bs/os_dep/os_intfs.c
+++ b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
@@ -1141,7 +1141,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 97a1e0da3034..387c5165428c 100644
--- a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
+++ b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
@@ -211,8 +211,7 @@ static void sd_intf_stop(struct adapter *padapter)
if (!padapter)
return;
- /* hal dep */
- rtw_hal_disable_interrupt(padapter);
+ DisableInterrupt8723BSdio(padapter);
}
@@ -281,7 +280,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.54.0
next prev parent reply other threads:[~2026-04-30 17:30 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-04-30 17:29 [PATCH v2 0/2] staging: rtl8723bs: cleanup hal/hal_intf.c Nikolay Kulikov
2026-04-30 17:29 ` Nikolay Kulikov [this message]
2026-04-30 20:39 ` [PATCH v2 1/2] staging: rtl8723bs: remove wrapper rtw_hal_disable_interrupt() Luka Gejak
2026-04-30 17:29 ` [PATCH v2 2/2] staging: rtl8723bs: rename DisableInterrupt8723BSdio() to snake_case Nikolay Kulikov
2026-04-30 20:43 ` Luka Gejak
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=20260430172954.12828-2-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