staging: rtl8712: r8712_wdg_timeout_handler: Remove function

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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>

authored by

Nishka Dasgupta and committed by

Greg Kroah-Hartman 6 years ago 0236f87b ec25a9c5

+1 -7

3 changed files

expand all

drivers

staging

rtl8712

mlme_linux.c

rtl871x_mlme.c

rtl871x_mlme.h

+1 -1

drivers/staging/rtl8712/mlme_linux.c

··· 60 60 struct _adapter *adapter = 61 61 from_timer(adapter, t, mlmepriv.wdg_timer); 62 62 63 - _r8712_wdg_timeout_handler(adapter); 63 + r8712_wdg_wk_cmd(adapter); 64 64 65 65 mod_timer(&adapter->mlmepriv.wdg_timer, 66 66 jiffies + msecs_to_jiffies(2000));

-5

drivers/staging/rtl8712/rtl871x_mlme.c

··· 1079 1079 adapter->registrypriv.smart_ps); 1080 1080 } 1081 1081 1082 - void _r8712_wdg_timeout_handler(struct _adapter *adapter) 1083 - { 1084 - r8712_wdg_wk_cmd(adapter); 1085 - } 1086 - 1087 1082 int r8712_select_and_join_from_scan(struct mlme_priv *pmlmepriv) 1088 1083 { 1089 1084 struct list_head *phead;

-1

drivers/staging/rtl8712/rtl871x_mlme.h

··· 195 195 void _r8712_join_timeout_handler(struct _adapter *adapter); 196 196 void r8712_scan_timeout_handler(struct _adapter *adapter); 197 197 void _r8712_dhcp_timeout_handler(struct _adapter *adapter); 198 - void _r8712_wdg_timeout_handler(struct _adapter *adapter); 199 198 struct wlan_network *_r8712_alloc_network(struct mlme_priv *pmlmepriv); 200 199 sint r8712_if_up(struct _adapter *padapter); 201 200 void r8712_joinbss_reset(struct _adapter *padapter);