diff options
| author |   Nishka Dasgupta <nishkadg.linux@gmail.com> | 2019-06-21 11:38:10 +0530 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-21 16:46:18 +0200 |
| commit | 0236f87b80aba7115cc446c2f6d5ba1180cb2fa7 (patch) | |
| tree | 530689defb396d4a4e4abb39ff7344c33d63ea13 /drivers/staging | |
| parent | staging: rtl8712: r8712_wdg_wk_cmd(): Change return type (diff) | |
| download | linux-dev-0236f87b80aba7115cc446c2f6d5ba1180cb2fa7.tar.xz linux-dev-0236f87b80aba7115cc446c2f6d5ba1180cb2fa7.zip | |
staging: rtl8712: r8712_wdg_timeout_handler: Remove function
Remove function _r8712_wdg_timeout_handler as all it does is call
r8712_wdg_wk_cmd. Modify call site of _r8712_wdg_timeout_handler to call
r8712_wdg_wk_cmd instead.
Signed-off-by: Nishka Dasgupta <nishkadg.linux@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/rtl8712/mlme_linux.c | 2 | ||||
| -rw-r--r-- | drivers/staging/rtl8712/rtl871x_mlme.c | 5 | ||||
| -rw-r--r-- | drivers/staging/rtl8712/rtl871x_mlme.h | 1 |
3 files changed, 1 insertions, 7 deletions
diff --git a/drivers/staging/rtl8712/mlme_linux.c b/drivers/staging/rtl8712/mlme_linux.c index 23b87ccf4d07..b9f5104f3bf7 100644 --- a/drivers/staging/rtl8712/mlme_linux.c +++ b/drivers/staging/rtl8712/mlme_linux.c @@ -60,7 +60,7 @@ static void wdg_timeout_handler (struct timer_list *t) struct _adapter *adapter = from_timer(adapter, t, mlmepriv.wdg_timer); - _r8712_wdg_timeout_handler(adapter); + r8712_wdg_wk_cmd(adapter); mod_timer(&adapter->mlmepriv.wdg_timer, jiffies + msecs_to_jiffies(2000)); diff --git a/drivers/staging/rtl8712/rtl871x_mlme.c b/drivers/staging/rtl8712/rtl871x_mlme.c index b260c29ea4bd..c55555546d42 100644 --- a/drivers/staging/rtl8712/rtl871x_mlme.c +++ b/drivers/staging/rtl8712/rtl871x_mlme.c @@ -1079,11 +1079,6 @@ void _r8712_dhcp_timeout_handler (struct _adapter *adapter) adapter->registrypriv.smart_ps); } -void _r8712_wdg_timeout_handler(struct _adapter *adapter) -{ - r8712_wdg_wk_cmd(adapter); -} - int r8712_select_and_join_from_scan(struct mlme_priv *pmlmepriv) { struct list_head *phead; diff --git a/drivers/staging/rtl8712/rtl871x_mlme.h b/drivers/staging/rtl8712/rtl871x_mlme.h index 9e8343139414..a160107e9801 100644 --- a/drivers/staging/rtl8712/rtl871x_mlme.h +++ b/drivers/staging/rtl8712/rtl871x_mlme.h @@ -195,7 +195,6 @@ void _r8712_sitesurvey_ctrl_handler(struct _adapter *adapter); void _r8712_join_timeout_handler(struct _adapter *adapter); void r8712_scan_timeout_handler(struct _adapter *adapter); void _r8712_dhcp_timeout_handler(struct _adapter *adapter); -void _r8712_wdg_timeout_handler(struct _adapter *adapter); struct wlan_network *_r8712_alloc_network(struct mlme_priv *pmlmepriv); sint r8712_if_up(struct _adapter *padapter); void r8712_joinbss_reset(struct _adapter *padapter); |