staging: rtl8723au: from hal_ops 'interface_ps_func'

Lots of hoops for a dummy function which was never called

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723au/core/rtw_pwrctrl.c b/drivers/staging/rtl8723au/core/rtw_pwrctrl.c
index 7370a39..8a95ae1 100644 (file)
--- a/drivers/staging/rtl8723au/core/rtw_pwrctrl.c
+++ b/drivers/staging/rtl8723au/core/rtw_pwrctrl.c
@@ -497,14 +497,6 @@ void rtw_free_pwrctrl_priv(struct rtw_adapter *adapter)
 {
 }
 
-u8 rtw_interface_ps_func23a(struct rtw_adapter *padapter, enum hal_intf_ps_func efunc_id, u8* val)
-{
-       u8 bResult = true;
-       rtw_hal_intf_ps_func23a(padapter, efunc_id, val);
-
-       return bResult;
-}
-
 inline void rtw_set_ips_deny23a(struct rtw_adapter *padapter, u32 ms)
 {
        struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv;

diff --git a/drivers/staging/rtl8723au/hal/hal_intf.c b/drivers/staging/rtl8723au/hal/hal_intf.c
index dad16bc..2868c72 100644 (file)
--- a/drivers/staging/rtl8723au/hal/hal_intf.c
+++ b/drivers/staging/rtl8723au/hal/hal_intf.c
@@ -178,13 +178,6 @@ u32        rtw_hal_inirp_deinit23a(struct rtw_adapter *padapter)
 
 }
 
-u8     rtw_hal_intf_ps_func23a(struct rtw_adapter *padapter, enum hal_intf_ps_func efunc_id, u8 *val)
-{
-       if (padapter->HalFunc.interface_ps_func)
-               return padapter->HalFunc.interface_ps_func(padapter, efunc_id, val);
-       return _FAIL;
-}
-
 s32    rtw_hal_xmit23aframe_enqueue(struct rtw_adapter *padapter, struct xmit_frame *pxmitframe)
 {
        if (padapter->HalFunc.hal_xmitframe_enqueue)

diff --git a/drivers/staging/rtl8723au/hal/usb_halinit.c b/drivers/staging/rtl8723au/hal/usb_halinit.c
index f300349..20c1135 100644 (file)
--- a/drivers/staging/rtl8723au/hal/usb_halinit.c
+++ b/drivers/staging/rtl8723au/hal/usb_halinit.c
@@ -1739,12 +1739,6 @@ static void rtl8723au_init_default_value(struct rtw_adapter *padapter)
        rtl8723a_init_default_value(padapter);
 }
 
-static u8 rtl8192cu_ps_func(struct rtw_adapter *Adapter,
-                           enum hal_intf_ps_func efunc_id, u8 *val)
-{
-       return true;
-}
-
 int rtl8723au_set_hal_ops(struct rtw_adapter *padapter)
 {
        struct hal_ops  *pHalFunc = &padapter->HalFunc;
@@ -1779,7 +1773,6 @@ int rtl8723au_set_hal_ops(struct rtw_adapter *padapter)
        pHalFunc->hal_xmit = &rtl8723au_hal_xmit;
        pHalFunc->mgnt_xmit = &rtl8723au_mgnt_xmit;
        pHalFunc->hal_xmitframe_enqueue = &rtl8723au_hal_xmitframe_enqueue;
-       pHalFunc->interface_ps_func = &rtl8192cu_ps_func;
        rtl8723a_set_hal_ops(pHalFunc);
        return 0;
 }

diff --git a/drivers/staging/rtl8723au/include/hal_intf.h b/drivers/staging/rtl8723au/include/hal_intf.h
index 1df82b6..5567a85 100644 (file)
--- a/drivers/staging/rtl8723au/include/hal_intf.h
+++ b/drivers/staging/rtl8723au/include/hal_intf.h
@@ -60,11 +60,6 @@ enum hal_odm_variable {
        HAL_ODM_WIFI_DISPLAY_STATE,
 };
 
-enum hal_intf_ps_func {
-       HAL_USB_SELECT_SUSPEND,
-       HAL_MAX_ID,
-};
-
 struct hal_ops {
        u32 (*hal_power_on)(struct rtw_adapter *padapter);
        u32 (*hal_init)(struct rtw_adapter *padapter);
@@ -124,9 +119,6 @@ struct hal_ops {
        void (*Add_RateATid)(struct rtw_adapter *padapter, u32 bitmap,
                             u8 arg, u8 rssi_level);
 
-       u8 (*interface_ps_func)(struct rtw_adapter *padapter,
-                               enum hal_intf_ps_func efunc_id, u8 *val);
-
        s32 (*hal_xmit)(struct rtw_adapter *padapter,
                        struct xmit_frame *pxmitframe);
        s32 (*mgnt_xmit)(struct rtw_adapter *padapter,
@@ -253,9 +245,6 @@ void rtw_hal_disable_interrupt23a(struct rtw_adapter *padapter);
 u32 rtw_hal_inirp_init23a(struct rtw_adapter *padapter);
 u32 rtw_hal_inirp_deinit23a(struct rtw_adapter *padapter);
 
-u8 rtw_hal_intf_ps_func23a(struct rtw_adapter *padapter,
-                          enum hal_intf_ps_func efunc_id, u8 *val);
-
 s32 rtw_hal_xmit23aframe_enqueue(struct rtw_adapter *padapter,
                                 struct xmit_frame *pxmitframe);
 s32 rtw_hal_xmit23a(struct rtw_adapter *padapter,

diff --git a/drivers/staging/rtl8723au/include/rtw_pwrctrl.h b/drivers/staging/rtl8723au/include/rtw_pwrctrl.h
index e0da87d..062c382 100644 (file)
--- a/drivers/staging/rtl8723au/include/rtw_pwrctrl.h
+++ b/drivers/staging/rtl8723au/include/rtw_pwrctrl.h
@@ -250,8 +250,6 @@ s32 LPS_RF_ON_check23a(struct rtw_adapter *padapter, u32 delay_ms);
 void LPS_Enter23a(struct rtw_adapter *padapter);
 void LPS_Leave23a(struct rtw_adapter *padapter);
 
-u8 rtw_interface_ps_func23a(struct rtw_adapter *padapter,
-                        enum hal_intf_ps_func efunc_id, u8 *val);
 void rtw_set_ips_deny23a(struct rtw_adapter *padapter, u32 ms);
 int _rtw_pwr_wakeup23a(struct rtw_adapter *padapter, u32 ips_deffer_ms,
                    const char *caller);