diff options
author | navin patidar <navin.patidar@gmail.com> | 2014-07-28 13:41:26 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-30 20:16:09 -0400 |
commit | 0120668adcd3c769c9c66dbe2652cda8a0b3e7ee (patch) | |
tree | 5eaeafc3cfbbbd1cd7ac88e36c8874f7bdb26d57 | |
parent | bd29334313386c2c29df1bdd5eadf4e204fa8879 (diff) |
staging: rtl8188eu: Remove wrapper function _survey_timer_hdl()
Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 3 | ||||
-rw-r--r-- | drivers/staging/rtl8188eu/include/rtw_mlme_ext.h | 2 | ||||
-rw-r--r-- | drivers/staging/rtl8188eu/os_dep/mlme_linux.c | 9 |
3 files changed, 4 insertions, 10 deletions
diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c index 41cfd30a1a7e..b113f0b88a17 100644 --- a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c +++ b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | |||
@@ -4833,8 +4833,9 @@ void linked_status_chk(struct adapter *padapter) | |||
4833 | } | 4833 | } |
4834 | } | 4834 | } |
4835 | 4835 | ||
4836 | void survey_timer_hdl(struct adapter *padapter) | 4836 | void survey_timer_hdl(void *function_context) |
4837 | { | 4837 | { |
4838 | struct adapter *padapter = (struct adapter *)function_context; | ||
4838 | struct cmd_obj *ph2c; | 4839 | struct cmd_obj *ph2c; |
4839 | struct sitesurvey_parm *psurveyPara; | 4840 | struct sitesurvey_parm *psurveyPara; |
4840 | struct cmd_priv *pcmdpriv = &padapter->cmdpriv; | 4841 | struct cmd_priv *pcmdpriv = &padapter->cmdpriv; |
diff --git a/drivers/staging/rtl8188eu/include/rtw_mlme_ext.h b/drivers/staging/rtl8188eu/include/rtw_mlme_ext.h index 654bd365f969..a948d45bc8a9 100644 --- a/drivers/staging/rtl8188eu/include/rtw_mlme_ext.h +++ b/drivers/staging/rtl8188eu/include/rtw_mlme_ext.h | |||
@@ -646,7 +646,7 @@ void mlmeext_sta_add_event_callback(struct adapter *padapter, | |||
646 | 646 | ||
647 | void linked_status_chk(struct adapter *padapter); | 647 | void linked_status_chk(struct adapter *padapter); |
648 | 648 | ||
649 | void survey_timer_hdl (struct adapter *padapter); | 649 | void survey_timer_hdl (void *function_context); |
650 | void link_timer_hdl (struct adapter *padapter); | 650 | void link_timer_hdl (struct adapter *padapter); |
651 | void addba_timer_hdl(struct sta_info *psta); | 651 | void addba_timer_hdl(struct sta_info *psta); |
652 | 652 | ||
diff --git a/drivers/staging/rtl8188eu/os_dep/mlme_linux.c b/drivers/staging/rtl8188eu/os_dep/mlme_linux.c index 82b71fa9d148..f59e13097345 100644 --- a/drivers/staging/rtl8188eu/os_dep/mlme_linux.c +++ b/drivers/staging/rtl8188eu/os_dep/mlme_linux.c | |||
@@ -129,13 +129,6 @@ void rtw_report_sec_ie(struct adapter *adapter, u8 authmode, u8 *sec_ie) | |||
129 | } | 129 | } |
130 | } | 130 | } |
131 | 131 | ||
132 | static void _survey_timer_hdl(void *FunctionContext) | ||
133 | { | ||
134 | struct adapter *padapter = (struct adapter *)FunctionContext; | ||
135 | |||
136 | survey_timer_hdl(padapter); | ||
137 | } | ||
138 | |||
139 | static void _link_timer_hdl(void *FunctionContext) | 132 | static void _link_timer_hdl(void *FunctionContext) |
140 | { | 133 | { |
141 | struct adapter *padapter = (struct adapter *)FunctionContext; | 134 | struct adapter *padapter = (struct adapter *)FunctionContext; |
@@ -157,7 +150,7 @@ void init_mlme_ext_timer(struct adapter *padapter) | |||
157 | { | 150 | { |
158 | struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; | 151 | struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; |
159 | 152 | ||
160 | _init_timer(&pmlmeext->survey_timer, padapter->pnetdev, _survey_timer_hdl, padapter); | 153 | _init_timer(&pmlmeext->survey_timer, padapter->pnetdev, survey_timer_hdl, padapter); |
161 | _init_timer(&pmlmeext->link_timer, padapter->pnetdev, _link_timer_hdl, padapter); | 154 | _init_timer(&pmlmeext->link_timer, padapter->pnetdev, _link_timer_hdl, padapter); |
162 | } | 155 | } |
163 | 156 | ||