]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
uwb: rsv: Use setup_timer
authorMuhammad Falak R Wani <falakreyaz@gmail.com>
Tue, 20 Oct 2015 18:30:37 +0000 (00:00 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 25 Oct 2015 02:52:53 +0000 (19:52 -0700)
Use timer API function setup_timer instead of init_timer to
initialize the timer.

Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/uwb/rsv.c

index 536ad42b0a4b1d7ed0091e4e943a19abf9d0980d..f5e27247a38feac0a0294a57fa49ad0a260be637 100644 (file)
@@ -470,9 +470,7 @@ static struct uwb_rsv *uwb_rsv_alloc(struct uwb_rc *rc)
        INIT_LIST_HEAD(&rsv->rc_node);
        INIT_LIST_HEAD(&rsv->pal_node);
        kref_init(&rsv->kref);
-       init_timer(&rsv->timer);
-       rsv->timer.function = uwb_rsv_timer;
-       rsv->timer.data     = (unsigned long)rsv;
+       setup_timer(&rsv->timer, uwb_rsv_timer, (unsigned long)rsv);
 
        rsv->rc = rc;
        INIT_WORK(&rsv->handle_timeout_work, uwb_rsv_handle_timeout_work);
@@ -989,9 +987,8 @@ void uwb_rsv_init(struct uwb_rc *rc)
        rc->bow.can_reserve_extra_mases = true;
        rc->bow.total_expired = 0;
        rc->bow.window = UWB_DRP_BACKOFF_WIN_MIN >> 1;
-       init_timer(&rc->bow.timer);
-       rc->bow.timer.function = uwb_rsv_backoff_win_timer;
-       rc->bow.timer.data     = (unsigned long)&rc->bow;
+       setup_timer(&rc->bow.timer, uwb_rsv_backoff_win_timer,
+                       (unsigned long)&rc->bow);
 
        bitmap_complement(rc->uwb_dev.streams, rc->uwb_dev.streams, UWB_NUM_STREAMS);
 }