staging: rtl8188eu: Remove wrapper function rtw_join_timeout_handler() (457c3e90) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/staging/rtl8188eu/core/rtw_mlme.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1362,8 +1362,9 @@ void rtw_cpwm_event_callback(struct adapter padapter, u8 pbuf)
	* _rtw_join_timeout_handler - Timeout/faliure handler for CMD JoinBss		* _rtw_join_timeout_handler - Timeout/faliure handler for CMD JoinBss
	* @adapter: pointer to struct adapter structure		* @adapter: pointer to struct adapter structure
	*/		*/
	void _rtw_join_timeout_handler (struct adapter *adapter)		void _rtw_join_timeout_handler (void *function_context)
	{		{
			struct adapter adapter = (struct adapter )function_context;
	struct mlme_priv *pmlmepriv = &adapter->mlmepriv;		struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
	int do_join_r;		int do_join_r;

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -436,7 +436,6 @@ void indicate_wx_scan_complete_event(struct adapter *padapter);
	void rtw_indicate_wx_assoc_event(struct adapter *padapter);		void rtw_indicate_wx_assoc_event(struct adapter *padapter);
	void rtw_indicate_wx_disassoc_event(struct adapter *padapter);		void rtw_indicate_wx_disassoc_event(struct adapter *padapter);
	int event_thread(void *context);		int event_thread(void *context);
	void rtw_join_timeout_handler(void *FunctionContext);
	void _rtw_scan_timeout_handler(void *FunctionContext);		void _rtw_scan_timeout_handler(void *FunctionContext);
	void rtw_free_network_queue(struct adapter *adapter, u8 isfreeall);		void rtw_free_network_queue(struct adapter *adapter, u8 isfreeall);
	int rtw_init_mlme_priv(struct adapter *adapter);		int rtw_init_mlme_priv(struct adapter *adapter);
	@@ -553,7 +552,7 @@ void rtw_update_registrypriv_dev_network(struct adapter *adapter);

	void rtw_get_encrypt_decrypt_from_registrypriv(struct adapter *adapter);		void rtw_get_encrypt_decrypt_from_registrypriv(struct adapter *adapter);

	void _rtw_join_timeout_handler(struct adapter *adapter);		void _rtw_join_timeout_handler(void *function_context);
	void rtw_scan_timeout_handler(struct adapter *adapter);		void rtw_scan_timeout_handler(struct adapter *adapter);

	void rtw_dynamic_check_timer_handlder(struct adapter *adapter);		void rtw_dynamic_check_timer_handlder(struct adapter *adapter);

+1 −9

Original line number	Original line	Diff line number	Diff line
	@@ -25,14 +25,6 @@
	#include <drv_types.h>		#include <drv_types.h>
	#include <mlme_osdep.h>		#include <mlme_osdep.h>

	void rtw_join_timeout_handler (void *FunctionContext)
	{
	struct adapter adapter = (struct adapter )FunctionContext;

	_rtw_join_timeout_handler(adapter);
	}


	void _rtw_scan_timeout_handler (void *FunctionContext)		void _rtw_scan_timeout_handler (void *FunctionContext)
	{		{
	struct adapter adapter = (struct adapter )FunctionContext;		struct adapter adapter = (struct adapter )FunctionContext;
	@@ -54,7 +46,7 @@ void rtw_init_mlme_timer(struct adapter *padapter)
	{		{
	struct mlme_priv *pmlmepriv = &padapter->mlmepriv;		struct mlme_priv *pmlmepriv = &padapter->mlmepriv;

	_init_timer(&(pmlmepriv->assoc_timer), padapter->pnetdev, rtw_join_timeout_handler, padapter);		_init_timer(&(pmlmepriv->assoc_timer), padapter->pnetdev, _rtw_join_timeout_handler, padapter);
	_init_timer(&(pmlmepriv->scan_to_timer), padapter->pnetdev, _rtw_scan_timeout_handler, padapter);		_init_timer(&(pmlmepriv->scan_to_timer), padapter->pnetdev, _rtw_scan_timeout_handler, padapter);
	_init_timer(&(pmlmepriv->dynamic_chk_timer), padapter->pnetdev, _dynamic_check_timer_handlder, padapter);		_init_timer(&(pmlmepriv->dynamic_chk_timer), padapter->pnetdev, _dynamic_check_timer_handlder, padapter);
	}		}