staging: rtl8723bs: Remove function pointer check_ips_status

Remove function pointer check_ips_status and use CheckIPSStatus directly
to increase readability.

Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/afcfbc2381d02a9f63a6ccc7acf4f31a24547488.1730619982.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 11d75b1b1ea9d7dbfe01ec9f96326c92b054f201..44fab4eecb5e24a334dbe3912b66a325709f5c61 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/hal_intf.c
+++ b/drivers/staging/rtl8723bs/hal/hal_intf.c
@@ -156,12 +156,7 @@ void rtw_hal_disable_interrupt(struct adapter *padapter)
 
 u8 rtw_hal_check_ips_status(struct adapter *padapter)
 {
-       u8 val = false;
-
-       if (padapter->HalFunc.check_ips_status)
-               val = padapter->HalFunc.check_ips_status(padapter);
-
-       return val;
+       return CheckIPSStatus(padapter);
 }
 
 s32    rtw_hal_xmitframe_enqueue(struct adapter *padapter, struct xmit_frame *pxmitframe)

diff --git a/drivers/staging/rtl8723bs/hal/sdio_halinit.c b/drivers/staging/rtl8723bs/hal/sdio_halinit.c
index a64b28bee019f8fae8b12f0ad6d74d7ce5e7ac92..1211b7b440cf6c106e35904dd32b0889541b6580 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->check_ips_status = &CheckIPSStatus;
        pHalFunc->SetHwRegHandler = &SetHwReg8723BS;
        pHalFunc->GetHwRegHandler = &GetHwReg8723BS;
        pHalFunc->SetHwRegHandlerWithBuf = &SetHwRegWithBuf8723B;

diff --git a/drivers/staging/rtl8723bs/include/hal_intf.h b/drivers/staging/rtl8723bs/include/hal_intf.h
index 5b52b0fd95f0113b87925bdbb55b05f1f323e29e..e6f4c398f35fceab385190e5f663fb1aded1b4a0 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 {
-       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);