summaryrefslogtreecommitdiffstats
path: root/drivers/staging/rtl8723bs/os_dep/recv_linux.c
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2017-10-24 01:27:23 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-11-03 14:49:08 +0100
commite8b1844a7e59fc35c086358021d9d42b4ce3ee22 (patch)
treea367d7d4aaca6d86b841561c679a1643c6b4e0ab /drivers/staging/rtl8723bs/os_dep/recv_linux.c
parent1663b8faad61439a4236e013a9146985494fe235 (diff)
downloadlinux-stable-e8b1844a7e59fc35c086358021d9d42b4ce3ee22.tar.gz
linux-stable-e8b1844a7e59fc35c086358021d9d42b4ce3ee22.tar.bz2
linux-stable-e8b1844a7e59fc35c086358021d9d42b4ce3ee22.zip
staging: rtl8723bs: Convert timers to use timer_setup()
In preparation for unconditionally passing the struct timer_list pointer to all timer callbacks, switch to using the new timer_setup() and from_timer() to pass the timer pointer explicitly. This performs some refactoring to remove needless wrapper functions, and adds a pointer back to the desired adapter. Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Shreeya Patel <shreeya.patel23498@gmail.com> Cc: Hans de Goede <hdegoede@redhat.com> Cc: Larry Finger <Larry.Finger@lwfinger.net> Cc: Himanshu Jha <himanshujha199640@gmail.com> Cc: Joe Perches <joe@perches.com> Cc: Derek Robson <robsonde@gmail.com> Cc: Harsha Sharma <harshasharmaiitr@gmail.com> Cc: Dan Carpenter <dan.carpenter@oracle.com> Cc: "David S. Miller" <davem@davemloft.net> Cc: Stephen Hemminger <stephen@networkplumber.org> Cc: yuan linyu <Linyu.Yuan@alcatel-sbell.com.cn> Cc: Johannes Berg <johannes.berg@intel.com> Cc: devel@driverdev.osuosl.org Signed-off-by: Kees Cook <keescook@chromium.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/rtl8723bs/os_dep/recv_linux.c')
-rw-r--r--drivers/staging/rtl8723bs/os_dep/recv_linux.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/staging/rtl8723bs/os_dep/recv_linux.c b/drivers/staging/rtl8723bs/os_dep/recv_linux.c
index f42e00081e0e..e804b430931c 100644
--- a/drivers/staging/rtl8723bs/os_dep/recv_linux.c
+++ b/drivers/staging/rtl8723bs/os_dep/recv_linux.c
@@ -356,8 +356,7 @@ _recv_indicatepkt_drop:
void rtw_init_recv_timer(struct recv_reorder_ctrl *preorder_ctrl)
{
- struct adapter *padapter = preorder_ctrl->padapter;
-
- _init_timer(&(preorder_ctrl->reordering_ctrl_timer), padapter->pnetdev, rtw_reordering_ctrl_timeout_handler, preorder_ctrl);
+ timer_setup(&preorder_ctrl->reordering_ctrl_timer,
+ rtw_reordering_ctrl_timeout_handler, 0);
}