staging: r8188eu: remove interface_ps_func from hal_ops

Remove interface_ps_func from hal_ops from hal_ops and remove its
wrapper rtw_hal_intf_ps_func() and the unused rtl8188eu_ps_func().

Signed-off-by: Michael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20210906190223.11396-9-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/r8188eu/hal/hal_intf.c b/drivers/staging/r8188eu/hal/hal_intf.c
index 4f89333..45166f1 100644 (file)
--- a/drivers/staging/r8188eu/hal/hal_intf.c
+++ b/drivers/staging/r8188eu/hal/hal_intf.c
@@ -101,15 +101,6 @@ u32 rtw_hal_inirp_deinit(struct adapter *adapt)
        return _FAIL;
 }
 
-u8 rtw_hal_intf_ps_func(struct adapter *adapt,
-                       enum hal_intf_ps_func efunc_id, u8 *val)
-{
-       if (adapt->HalFunc.interface_ps_func)
-               return adapt->HalFunc.interface_ps_func(adapt, efunc_id,
-                                                          val);
-       return _FAIL;
-}
-
 s32 rtw_hal_xmit(struct adapter *adapt, struct xmit_frame *pxmitframe)
 {
        if (adapt->HalFunc.hal_xmit)

diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8188eu/hal/usb_halinit.c
index 65f68f3..7b9cca4 100644 (file)
--- a/drivers/staging/r8188eu/hal/usb_halinit.c
+++ b/drivers/staging/r8188eu/hal/usb_halinit.c
@@ -2205,12 +2205,6 @@ void rtl8188eu_init_default_value(struct adapter *adapt)
                haldata->odmpriv.RFCalibrateInfo.ThermalValue_HP[i] = 0;
 }
 
-static u8 rtl8188eu_ps_func(struct adapter *Adapter, enum hal_intf_ps_func efunc_id, u8 *val)
-{
-       u8 bResult = true;
-       return bResult;
-}
-
 void rtl8188eu_set_hal_ops(struct adapter *adapt)
 {
        struct hal_ops  *halfunc = &adapt->HalFunc;
@@ -2243,8 +2237,5 @@ void rtl8188eu_set_hal_ops(struct adapter *adapt)
        halfunc->hal_xmit = &rtl8188eu_hal_xmit;
        halfunc->mgnt_xmit = &rtl8188eu_mgnt_xmit;
 
-       halfunc->interface_ps_func = &rtl8188eu_ps_func;
-
        rtl8188e_set_hal_ops(halfunc);
-
 }

diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r8188eu/include/hal_intf.h
index f6f0763..44a8943 100644 (file)
--- a/drivers/staging/r8188eu/include/hal_intf.h
+++ b/drivers/staging/r8188eu/include/hal_intf.h
@@ -175,8 +175,6 @@ struct hal_ops {
        void    (*AntDivCompareHandler)(struct adapter *adapter,
                                        struct wlan_bssid_ex *dst,
                                        struct wlan_bssid_ex *src);
-       u8      (*interface_ps_func)(struct adapter *padapter,
-                                    enum hal_intf_ps_func efunc_id, u8 *val);
 
        s32     (*hal_xmit)(struct adapter *padapter,
                            struct xmit_frame *pxmitframe);
@@ -261,9 +259,6 @@ u8 rtw_hal_get_def_var(struct adapter *padapter,
 u32    rtw_hal_inirp_init(struct adapter *padapter);
 u32    rtw_hal_inirp_deinit(struct adapter *padapter);
 
-u8     rtw_hal_intf_ps_func(struct adapter *padapter,
-                            enum hal_intf_ps_func efunc_id, u8 *val);
-
 s32    rtw_hal_xmit(struct adapter *padapter, struct xmit_frame *pxmitframe);
 s32    rtw_hal_mgnt_xmit(struct adapter *padapter,
                          struct xmit_frame *pmgntframe);