From: Muhammad Falak R Wani <falakreyaz@gmail.com>
Date: Tue, 20 Oct 2015 18:29:53 +0000 (+0530)
Subject: uwb: neh: Use setup_timer
X-Git-Tag: v4.4-rc1~127^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b9ca0c948c921e960006aaf319a29c004917cdf6;p=thirdparty%2Fkernel%2Flinux.git

uwb: neh: 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>
---

diff --git a/drivers/uwb/neh.c b/drivers/uwb/neh.c
index 8cb71bb333c2e..36b5cb62c15db 100644
--- a/drivers/uwb/neh.c
+++ b/drivers/uwb/neh.c
@@ -223,9 +223,7 @@ struct uwb_rc_neh *uwb_rc_neh_add(struct uwb_rc *rc, struct uwb_rccb *cmd,
 
 	kref_init(&neh->kref);
 	INIT_LIST_HEAD(&neh->list_node);
-	init_timer(&neh->timer);
-	neh->timer.function = uwb_rc_neh_timer;
-	neh->timer.data     = (unsigned long)neh;
+	setup_timer(&neh->timer, uwb_rc_neh_timer, (unsigned long)neh);
 
 	neh->rc = rc;
 	neh->evt_type = expected_type;