evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: rtl8723au: from hal_ops 'interface_ps_func'

Browse source 
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>
This commit is contained in:
Jes Sorensen 2014-04-26 18:55:38 +02:00 • committed by Greg Kroah-Hartman
parent 7fb79ab959
commit b52f88d901
5 changed files with 0 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/staging/rtl8723au/core/rtw_pwrctrl.c
View file

@ -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) inline void rtw_set_ips_deny23a(struct rtw_adapter *padapter, u32 ms)
{ {
struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv;

7
drivers/staging/rtl8723au/hal/hal_intf.c
View file

@ -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) s32 rtw_hal_xmit23aframe_enqueue(struct rtw_adapter *padapter, struct xmit_frame *pxmitframe)
{ {
if (padapter->HalFunc.hal_xmitframe_enqueue) if (padapter->HalFunc.hal_xmitframe_enqueue)

7
drivers/staging/rtl8723au/hal/usb_halinit.c
View file

@ -1739,12 +1739,6 @@ static void rtl8723au_init_default_value(struct rtw_adapter *padapter)
rtl8723a_init_default_value(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) int rtl8723au_set_hal_ops(struct rtw_adapter *padapter)
{ {
struct hal_ops *pHalFunc = &padapter->HalFunc; 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->hal_xmit = &rtl8723au_hal_xmit;
pHalFunc->mgnt_xmit = &rtl8723au_mgnt_xmit; pHalFunc->mgnt_xmit = &rtl8723au_mgnt_xmit;
pHalFunc->hal_xmitframe_enqueue = &rtl8723au_hal_xmitframe_enqueue; pHalFunc->hal_xmitframe_enqueue = &rtl8723au_hal_xmitframe_enqueue;
pHalFunc->interface_ps_func = &rtl8192cu_ps_func;
rtl8723a_set_hal_ops(pHalFunc); rtl8723a_set_hal_ops(pHalFunc);
return 0; return 0;
} }

11
drivers/staging/rtl8723au/include/hal_intf.h
View file

@ -60,11 +60,6 @@ enum hal_odm_variable {
HAL_ODM_WIFI_DISPLAY_STATE, HAL_ODM_WIFI_DISPLAY_STATE,
}; };
enum hal_intf_ps_func {
HAL_USB_SELECT_SUSPEND,
HAL_MAX_ID,
};
struct hal_ops { struct hal_ops {
u32 (*hal_power_on)(struct rtw_adapter *padapter); u32 (*hal_power_on)(struct rtw_adapter *padapter);
u32 (*hal_init)(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, void (*Add_RateATid)(struct rtw_adapter *padapter, u32 bitmap,
u8 arg, u8 rssi_level); 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, s32 (*hal_xmit)(struct rtw_adapter *padapter,
struct xmit_frame *pxmitframe); struct xmit_frame *pxmitframe);
s32 (*mgnt_xmit)(struct rtw_adapter *padapter, 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_init23a(struct rtw_adapter *padapter);
u32 rtw_hal_inirp_deinit23a(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, s32 rtw_hal_xmit23aframe_enqueue(struct rtw_adapter *padapter,
struct xmit_frame *pxmitframe); struct xmit_frame *pxmitframe);
s32 rtw_hal_xmit23a(struct rtw_adapter *padapter, s32 rtw_hal_xmit23a(struct rtw_adapter *padapter,

2
drivers/staging/rtl8723au/include/rtw_pwrctrl.h
View file

@ -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_Enter23a(struct rtw_adapter *padapter);
void LPS_Leave23a(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); void rtw_set_ips_deny23a(struct rtw_adapter *padapter, u32 ms);
int _rtw_pwr_wakeup23a(struct rtw_adapter *padapter, u32 ips_deffer_ms, int _rtw_pwr_wakeup23a(struct rtw_adapter *padapter, u32 ips_deffer_ms,
const char *caller); const char *caller);