staging: rtl8188eu: Remove wrapper function _link_timer_hdl()
authornavin patidar <navin.patidar@gmail.com>
Mon, 28 Jul 2014 17:41:27 +0000 (23:11 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 31 Jul 2014 00:16:10 +0000 (17:16 -0700)
Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
drivers/staging/rtl8188eu/include/rtw_mlme_ext.h
drivers/staging/rtl8188eu/os_dep/mlme_linux.c

index b113f0b88a1710004dee2d129b54edef7132976d..f18bb78defcbf56cfa1cb17d50febec945e9c885 100644 (file)
@@ -4873,8 +4873,9 @@ exit_survey_timer_hdl:
        return;
 }
 
-void link_timer_hdl(struct adapter *padapter)
+void link_timer_hdl(void *function_context)
 {
+       struct adapter *padapter = (struct adapter *)function_context;
        struct mlme_ext_priv    *pmlmeext = &padapter->mlmeextpriv;
        struct mlme_ext_info    *pmlmeinfo = &(pmlmeext->mlmext_info);
 
index a948d45bc8a9c32cf310f3048318a6eb8fb8c82e..05a010f5aeb3f20e3302aeef8e0248d818632501 100644 (file)
@@ -647,7 +647,7 @@ void mlmeext_sta_add_event_callback(struct adapter *padapter,
 void linked_status_chk(struct adapter *padapter);
 
 void survey_timer_hdl (void *function_context);
-void link_timer_hdl (struct adapter *padapter);
+void link_timer_hdl (void *funtion_context);
 void addba_timer_hdl(struct sta_info *psta);
 
 #define set_survey_timer(mlmeext, ms) \
index f59e130973455906e8d9ac291e6494ff924300fd..4f5fa08ecf9cd8586448c786f1efad0b5a878494 100644 (file)
@@ -129,12 +129,6 @@ void rtw_report_sec_ie(struct adapter *adapter, u8 authmode, u8 *sec_ie)
        }
 }
 
-static void _link_timer_hdl(void *FunctionContext)
-{
-       struct adapter *padapter = (struct adapter *)FunctionContext;
-       link_timer_hdl(padapter);
-}
-
 static void _addba_timer_hdl(void *FunctionContext)
 {
        struct sta_info *psta = (struct sta_info *)FunctionContext;
@@ -151,7 +145,7 @@ void init_mlme_ext_timer(struct adapter *padapter)
        struct  mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
 
        _init_timer(&pmlmeext->survey_timer, padapter->pnetdev, survey_timer_hdl, padapter);
-       _init_timer(&pmlmeext->link_timer, padapter->pnetdev, _link_timer_hdl, padapter);
+       _init_timer(&pmlmeext->link_timer, padapter->pnetdev, link_timer_hdl, padapter);
 }
 
 #ifdef CONFIG_88EU_AP_MODE