diff options
author | Muhammad Falak R Wani <falakreyaz@gmail.com> | 2015-10-20 14:30:37 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-24 22:52:53 -0400 |
commit | a895dc0509e6d2dbe4ec8a184a55323738fde9f6 (patch) | |
tree | ff3f18c7d9c399f9e1a7a5104a70689f8a9d7217 | |
parent | f504ab1888026d15b5be8f9c262bf4ae9cacd177 (diff) |
uwb: rsv: Use setup_timer
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>
-rw-r--r-- | drivers/uwb/rsv.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/uwb/rsv.c b/drivers/uwb/rsv.c index 536ad42b0a4b..f5e27247a38f 100644 --- a/drivers/uwb/rsv.c +++ b/drivers/uwb/rsv.c | |||
@@ -470,9 +470,7 @@ static struct uwb_rsv *uwb_rsv_alloc(struct uwb_rc *rc) | |||
470 | INIT_LIST_HEAD(&rsv->rc_node); | 470 | INIT_LIST_HEAD(&rsv->rc_node); |
471 | INIT_LIST_HEAD(&rsv->pal_node); | 471 | INIT_LIST_HEAD(&rsv->pal_node); |
472 | kref_init(&rsv->kref); | 472 | kref_init(&rsv->kref); |
473 | init_timer(&rsv->timer); | 473 | setup_timer(&rsv->timer, uwb_rsv_timer, (unsigned long)rsv); |
474 | rsv->timer.function = uwb_rsv_timer; | ||
475 | rsv->timer.data = (unsigned long)rsv; | ||
476 | 474 | ||
477 | rsv->rc = rc; | 475 | rsv->rc = rc; |
478 | INIT_WORK(&rsv->handle_timeout_work, uwb_rsv_handle_timeout_work); | 476 | INIT_WORK(&rsv->handle_timeout_work, uwb_rsv_handle_timeout_work); |
@@ -989,9 +987,8 @@ void uwb_rsv_init(struct uwb_rc *rc) | |||
989 | rc->bow.can_reserve_extra_mases = true; | 987 | rc->bow.can_reserve_extra_mases = true; |
990 | rc->bow.total_expired = 0; | 988 | rc->bow.total_expired = 0; |
991 | rc->bow.window = UWB_DRP_BACKOFF_WIN_MIN >> 1; | 989 | rc->bow.window = UWB_DRP_BACKOFF_WIN_MIN >> 1; |
992 | init_timer(&rc->bow.timer); | 990 | setup_timer(&rc->bow.timer, uwb_rsv_backoff_win_timer, |
993 | rc->bow.timer.function = uwb_rsv_backoff_win_timer; | 991 | (unsigned long)&rc->bow); |
994 | rc->bow.timer.data = (unsigned long)&rc->bow; | ||
995 | 992 | ||
996 | bitmap_complement(rc->uwb_dev.streams, rc->uwb_dev.streams, UWB_NUM_STREAMS); | 993 | bitmap_complement(rc->uwb_dev.streams, rc->uwb_dev.streams, UWB_NUM_STREAMS); |
997 | } | 994 | } |