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 <nikolayof23@gmail.com>
Reviewed-by: Luka Gejak <luka.gejak@linux.dev>
Link: https://patch.msgid.link/20260430172954.12828-2-nikolayof23@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723bs/hal/hal_intf.c b/drivers/staging/rtl8723bs/hal/hal_intf.c
index 529648036f58f0d7f73311e3fee9477a9b5fccdb..f75b8a8192b8b090e3cddd2d9a13067d148fff97 100644 (file)
--- 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 6af2337822ff08fb74243cfda01dc4181c6d81ae..1d62ea71a890f69d03024800a548e516b43372e1 100644 (file)
--- 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 b80f1d03ed5aeb1d6397b777c20ce7849cbd15b3..9270daa018b99dc628344be8dfc0ed412df9f887 100644 (file)
--- 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 cdb0b64cfaeb4234ddb8c0743b20b8c9bbf6dc62..d047481816eb6b29b0647d68bdb6a3f1afacdbcd 100644 (file)
--- 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;