diff options
| author | Muhammad Falak R Wani <falakreyaz@gmail.com> | 2015-10-20 20:30:37 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-25 03:52:53 +0100 |
| commit | a895dc0509e6d2dbe4ec8a184a55323738fde9f6 (patch) | |
| tree | ff3f18c7d9c399f9e1a7a5104a70689f8a9d7217 /drivers/uwb | |
| parent | USB: qcserial: add Sierra Wireless MC74xx/EM74xx (diff) | |
| download | linux-a895dc0509e6d2dbe4ec8a184a55323738fde9f6.tar.xz linux-a895dc0509e6d2dbe4ec8a184a55323738fde9f6.zip | |
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>
Diffstat (limited to 'drivers/uwb')
| -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) 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); } |