From: Muhammad Falak R Wani <falakreyaz@gmail.com>
Date: Tue, 20 Oct 2015 18:28:17 +0000 (+0530)
Subject: uwb: drp: Use setup_timer
X-Git-Tag: KARO-TX6UL-2015-11-03~36^2~6
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=cf0d5fbd5594444d7c46b16993f944bc318fd01d;p=karo-tx-linux.git

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>
---

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);