aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/uwb
diff options
context:
space:
mode:
authorMuhammad Falak R Wani <falakreyaz@gmail.com>2015-10-20 23:58:17 +0530
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-10-24 19:52:53 -0700
commitcf0d5fbd5594444d7c46b16993f944bc318fd01d (patch)
treedc8ca9f1525c05685e83c83864d779264a0c7370 /drivers/uwb
parentb9ca0c948c921e960006aaf319a29c004917cdf6 (diff)
uwb: drp: Use setup_timer
Use timer API function setup_timer instead of init_timer to initialize a kernel 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/drp.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/uwb/drp.c b/drivers/uwb/drp.c
index 8fc1b787dced..38d0504a1bbc 100644
--- a/drivers/uwb/drp.c
+++ b/drivers/uwb/drp.c
@@ -642,9 +642,7 @@ static void uwb_drp_handle_alien_drp(struct uwb_rc *rc, struct uwb_ie_drp *drp_i
}
INIT_LIST_HEAD(&cnflt->rc_node);
- init_timer(&cnflt->timer);
- cnflt->timer.function = uwb_cnflt_timer;
- cnflt->timer.data = (unsigned long)cnflt;
+ setup_timer(&cnflt->timer, uwb_cnflt_timer, (unsigned long)cnflt);
cnflt->rc = rc;
INIT_WORK(&cnflt->cnflt_update_work, uwb_cnflt_update_work);

Privacy Policy