From e5855f8a4728038bd3732092e2758653252213e3 Mon Sep 17 00:00:00 2001 From: Nikolay Kulikov Date: Thu, 30 Apr 2026 20:29:05 +0300 Subject: [PATCH] staging: rtl8723bs: remove wrapper rtw_hal_disable_interrupt() Remove unnecessary wrapper and call DisableInterrupt8723BSdio() function directly to simplify the code. Signed-off-by: Nikolay Kulikov Reviewed-by: Luka Gejak Link: https://patch.msgid.link/20260430172954.12828-2-nikolayof23@gmail.com Signed-off-by: Greg Kroah-Hartman --- 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 cdb0b64cfaeb..d047481816eb 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;