staging: rtl8723bs: Remove function pointer disable_interrupt

Remove function pointer disable_interrupt and use
DisableInterrupt8723BSdio directly to increase readability.

Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/fee97dadc88bbdaebd82c99d0b6106d58315bd85.1727966761.git.philipp.g.hortmann@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 716eefdf8ce22b6a914782b9093c45a755a17bd6..11d75b1b1ea9d7dbfe01ec9f96326c92b054f201 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/hal_intf.c
+++ b/drivers/staging/rtl8723bs/hal/hal_intf.c
@@ -151,8 +151,7 @@ void rtw_hal_enable_interrupt(struct adapter *padapter)
 
 void rtw_hal_disable_interrupt(struct adapter *padapter)
 {
-       if (padapter->HalFunc.disable_interrupt)
-               padapter->HalFunc.disable_interrupt(padapter);
+       DisableInterrupt8723BSdio(padapter);
 }
 
 u8 rtw_hal_check_ips_status(struct adapter *padapter)

diff --git a/drivers/staging/rtl8723bs/hal/sdio_halinit.c b/drivers/staging/rtl8723bs/hal/sdio_halinit.c
index 91aac5d1c23e635b81a7f6dfe00872bf70140761..a64b28bee019f8fae8b12f0ad6d74d7ce5e7ac92 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/sdio_halinit.c
+++ b/drivers/staging/rtl8723bs/hal/sdio_halinit.c
@@ -1259,7 +1259,6 @@ void rtl8723bs_set_hal_ops(struct adapter *padapter)
 
        rtl8723b_set_hal_ops(pHalFunc);
 
-       pHalFunc->disable_interrupt = &DisableInterrupt8723BSdio;
        pHalFunc->check_ips_status = &CheckIPSStatus;
        pHalFunc->SetHwRegHandler = &SetHwReg8723BS;
        pHalFunc->GetHwRegHandler = &GetHwReg8723BS;

diff --git a/drivers/staging/rtl8723bs/include/hal_intf.h b/drivers/staging/rtl8723bs/include/hal_intf.h
index 3b35bc30ae37fdd6c71c4b64f4a3e91652b0dc12..5b52b0fd95f0113b87925bdbb55b05f1f323e29e 100644 (file)
--- a/drivers/staging/rtl8723bs/include/hal_intf.h
+++ b/drivers/staging/rtl8723bs/include/hal_intf.h
@@ -162,7 +162,6 @@ enum hal_intf_ps_func {
 typedef s32 (*c2h_id_filter)(u8 *c2h_evt);
 
 struct hal_ops {
-       void (*disable_interrupt)(struct adapter *padapter);
        u8 (*check_ips_status)(struct adapter *padapter);
        void (*set_channel_handler)(struct adapter *padapter, u8 channel);
        void (*set_chnl_bw_handler)(struct adapter *padapter, u8 channel, enum channel_width Bandwidth, u8 Offset40, u8 Offset80);