Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e8b1844a authored by Kees Cook's avatar Kees Cook Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723bs: Convert timers to use timer_setup() 



In preparation for unconditionally passing the struct timer_list pointer to
all timer callbacks, switch to using the new timer_setup() and from_timer()
to pass the timer pointer explicitly. This performs some refactoring to
remove needless wrapper functions, and adds a pointer back to the desired
adapter.

Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Shreeya Patel <shreeya.patel23498@gmail.com>
Cc: Hans de Goede <hdegoede@redhat.com>
Cc: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Himanshu Jha <himanshujha199640@gmail.com>
Cc: Joe Perches <joe@perches.com>
Cc: Derek Robson <robsonde@gmail.com>
Cc: Harsha Sharma <harshasharmaiitr@gmail.com>
Cc: Dan Carpenter <dan.carpenter@oracle.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Stephen Hemminger <stephen@networkplumber.org>
Cc: yuan linyu <Linyu.Yuan@alcatel-sbell.com.cn>
Cc: Johannes Berg <johannes.berg@intel.com>
Cc: devel@driverdev.osuosl.org
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1663b8fa

drivers/staging/rtl8723bs/core/rtw_mlme.c

+7 −3
Original line number Diff line number Diff line
@@ -1814,8 +1814,10 @@ void rtw_wmm_event_callback(struct adapter *padapter, u8 *pbuf) 
* _rtw_join_timeout_handler - Timeout/failure handler for CMD JoinBss

* @adapter: pointer to struct adapter structure

*/

void _rtw_join_timeout_handler (struct adapter *adapter)

void _rtw_join_timeout_handler(struct timer_list *t)

{

	struct adapter *adapter = from_timer(adapter, t,

						  mlmepriv.assoc_timer);

	struct	mlme_priv *pmlmepriv = &adapter->mlmepriv;



	DBG_871X("%s, fw_state =%x\n", __func__, get_fwstate(pmlmepriv));
@@ -1867,8 +1869,10 @@ void _rtw_join_timeout_handler (struct adapter *adapter) 
* rtw_scan_timeout_handler - Timeout/Failure handler for CMD SiteSurvey

* @adapter: pointer to struct adapter structure

*/

void rtw_scan_timeout_handler (struct adapter *adapter)

void rtw_scan_timeout_handler(struct timer_list *t)

{

	struct adapter *adapter = from_timer(adapter, t,

						  mlmepriv.scan_to_timer);

	struct	mlme_priv *pmlmepriv = &adapter->mlmepriv;



	DBG_871X(FUNC_ADPT_FMT" fw_state =%x\n", FUNC_ADPT_ARG(adapter), get_fwstate(pmlmepriv));
@@ -1931,7 +1935,7 @@ static void rtw_auto_scan_handler(struct adapter *padapter) 
	return;

}



void rtw_dynamic_check_timer_handlder(struct adapter *adapter)

void rtw_dynamic_check_timer_handler(struct adapter *adapter)

{

	if (!adapter)

		return;

drivers/staging/rtl8723bs/core/rtw_mlme_ext.c

+11 −4
Original line number Diff line number Diff line
@@ -5830,8 +5830,10 @@ void linked_status_chk(struct adapter *padapter) 


}



void survey_timer_hdl(struct adapter *padapter)

void survey_timer_hdl(struct timer_list *t)

{

	struct adapter *padapter =

		from_timer(padapter, t, mlmeextpriv.survey_timer);

	struct cmd_obj	*ph2c;

	struct sitesurvey_parm	*psurveyPara;

	struct cmd_priv 				*pcmdpriv = &padapter->cmdpriv;
@@ -5877,8 +5879,10 @@ void survey_timer_hdl(struct adapter *padapter) 
	return;

}



void link_timer_hdl(struct adapter *padapter)

void link_timer_hdl(struct timer_list *t)

{

	struct adapter *padapter =

		from_timer(padapter, t, mlmeextpriv.link_timer);

	/* static unsigned int		rx_pkt = 0; */

	/* static u64				tx_cnt = 0; */

	/* struct xmit_priv 	*pxmitpriv = &(padapter->xmitpriv); */
@@ -5927,8 +5931,9 @@ void link_timer_hdl(struct adapter *padapter) 
	return;

}



void addba_timer_hdl(struct sta_info *psta)

void addba_timer_hdl(struct timer_list *t)

{

	struct sta_info *psta = from_timer(psta, t, addba_retry_timer);

	struct ht_priv *phtpriv;



	if (!psta)
@@ -5943,8 +5948,10 @@ void addba_timer_hdl(struct sta_info *psta) 
	}

}



void sa_query_timer_hdl(struct adapter *padapter)

void sa_query_timer_hdl(struct timer_list *t)

{

	struct adapter *padapter =

		from_timer(padapter, t, mlmeextpriv.sa_query_timer);

	struct mlme_priv *pmlmepriv = &padapter->mlmepriv;

	/* disconnect */

	spin_lock_bh(&pmlmepriv->lock);

drivers/staging/rtl8723bs/core/rtw_pwrctrl.c

+11 −12
Original line number Diff line number Diff line
@@ -201,10 +201,12 @@ void rtw_ps_processor(struct adapter *padapter) 
	return;

}



void pwr_state_check_handler(RTW_TIMER_HDL_ARGS);

void pwr_state_check_handler(RTW_TIMER_HDL_ARGS)

static void pwr_state_check_handler(struct timer_list *t)

{

	struct adapter *padapter = (struct adapter *)FunctionContext;

	struct pwrctrl_priv *pwrctrlpriv =

		from_timer(pwrctrlpriv, t, pwr_state_check_timer);

	struct adapter *padapter = pwrctrlpriv->adapter;



	rtw_ps_cmd(padapter);

}
@@ -823,14 +825,10 @@ static void rpwmtimeout_workitem_callback(struct work_struct *work) 
/*

 * This function is a timer handler, can't do any IO in it.

 */

static void pwr_rpwm_timeout_handler(void *FunctionContext)

static void pwr_rpwm_timeout_handler(struct timer_list *t)

{

	struct adapter *padapter;

	struct pwrctrl_priv *pwrpriv;

	struct pwrctrl_priv *pwrpriv = from_timer(pwrpriv, t, pwr_rpwm_timer);





	padapter = FunctionContext;

	pwrpriv = adapter_to_pwrctl(padapter);

	DBG_871X("+%s: rpwm = 0x%02X cpwm = 0x%02X\n", __func__, pwrpriv->rpwm, pwrpriv->cpwm);



	if ((pwrpriv->rpwm == pwrpriv->cpwm) || (pwrpriv->cpwm >= PS_STATE_S2)) {
@@ -1173,10 +1171,11 @@ void rtw_init_pwrctrl_priv(struct adapter *padapter) 
	_init_workitem(&pwrctrlpriv->cpwm_event, cpwm_event_callback, NULL);



	pwrctrlpriv->brpwmtimeout = false;

	pwrctrlpriv->adapter = padapter;

	_init_workitem(&pwrctrlpriv->rpwmtimeoutwi, rpwmtimeout_workitem_callback, NULL);

	_init_timer(&pwrctrlpriv->pwr_rpwm_timer, padapter->pnetdev, pwr_rpwm_timeout_handler, padapter);



	rtw_init_timer(&pwrctrlpriv->pwr_state_check_timer, padapter, pwr_state_check_handler);

	timer_setup(&pwrctrlpriv->pwr_rpwm_timer, pwr_rpwm_timeout_handler, 0);

	timer_setup(&pwrctrlpriv->pwr_state_check_timer,

		    pwr_state_check_handler, 0);



	pwrctrlpriv->wowlan_mode = false;

	pwrctrlpriv->wowlan_ap_mode = false;

drivers/staging/rtl8723bs/core/rtw_recv.c

+9 −6
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ u8 rtw_rfc1042_header[] = { 0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00 }; 
/* Bridge-Tunnel header (for EtherTypes ETH_P_AARP and ETH_P_IPX) */

u8 rtw_bridge_tunnel_header[] = { 0xaa, 0xaa, 0x03, 0x00, 0x00, 0xf8 };



void rtw_signal_stat_timer_hdl(RTW_TIMER_HDL_ARGS);

static void rtw_signal_stat_timer_hdl(struct timer_list *t);



void _rtw_init_sta_recv_priv(struct sta_recv_priv *psta_recvpriv)

{
@@ -86,7 +86,8 @@ sint _rtw_init_recv_priv(struct recv_priv *precvpriv, struct adapter *padapter) 


	res = rtw_hal_init_recv_priv(padapter);



	rtw_init_timer(&precvpriv->signal_stat_timer, padapter, rtw_signal_stat_timer_hdl);

	timer_setup(&precvpriv->signal_stat_timer, rtw_signal_stat_timer_hdl,

		    0);



	precvpriv->signal_stat_sampling_interval = 2000; /* ms */
@@ -2354,9 +2355,10 @@ int recv_indicatepkt_reorder(struct adapter *padapter, union recv_frame *prframe 
}





void rtw_reordering_ctrl_timeout_handler(void *pcontext)

void rtw_reordering_ctrl_timeout_handler(struct timer_list *t)

{

	struct recv_reorder_ctrl *preorder_ctrl = pcontext;

	struct recv_reorder_ctrl *preorder_ctrl =

		from_timer(preorder_ctrl, t, reordering_ctrl_timer);

	struct adapter *padapter = preorder_ctrl->padapter;

	struct __queue *ppending_recvframe_queue = &preorder_ctrl->pending_recvframe_queue;
@@ -2597,9 +2599,10 @@ s32 rtw_recv_entry(union recv_frame *precvframe) 
	return ret;

}



void rtw_signal_stat_timer_hdl(RTW_TIMER_HDL_ARGS)

static void rtw_signal_stat_timer_hdl(struct timer_list *t)

{

	struct adapter *adapter = (struct adapter *)FunctionContext;

	struct adapter *adapter =

		from_timer(adapter, t, recvpriv.signal_stat_timer);

	struct recv_priv *recvpriv = &adapter->recvpriv;



	u32 tmp_s, tmp_q;

drivers/staging/rtl8723bs/include/osdep_service.h

+0 −2
Original line number Diff line number Diff line
@@ -118,8 +118,6 @@ int _rtw_netif_rx(_nic_hdl ndev, struct sk_buff *skb); 


extern void _rtw_init_queue(struct __queue	*pqueue);



extern void rtw_init_timer(_timer *ptimer, void *padapter, void *pfunc);



static __inline void thread_enter(char *name)

{

	allow_signal(SIGTERM);