[PATCH] greybus: timesync: replace init_timer with setup_timer

Xie Qirong xieqr16 at lzu.edu.cn
Tue Dec 13 14:39:57 UTC 2016


The combination of init_timer and setting up the data and function field
manually is equivalent to calling setup_timer(). This is an api 
consolidation only and improves readability.

Signed-off-by: Xie Qirong <xieqr16 at lzu.edu.cn>
---

 setup_timer.cocci suggested the following improvement:
 drivers/staging/greybus/timesync.c:1058:1-11: Use setup_timer function 
 for function on line 1059.

 Patch was compile checked with: x86_64_defconfig + CONFIG_STAGING=y, 
 CONFIG_GREYBUS=m

 Kernel version: 4.9.0 (localversion-next is next-20161213)

 drivers/staging/greybus/timesync.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/greybus/timesync.c b/drivers/staging/greybus/timesync.c
index 29e6c1c..af83e12 100644
--- a/drivers/staging/greybus/timesync.c
+++ b/drivers/staging/greybus/timesync.c
@@ -1055,10 +1055,9 @@ int gb_timesync_svc_add(struct gb_svc *svc)
 		goto done;
 	}
 
-	init_timer(&timesync_svc->ktime_timer);
-	timesync_svc->ktime_timer.function = gb_timesync_ktime_timer_fn;
+	setup_timer(&timesync_svc->ktime_timer, gb_timesync_ktime_timer_fn,
+		(unsigned long)timesync_svc);
 	timesync_svc->ktime_timer.expires = jiffies + GB_TIMESYNC_KTIME_UPDATE;
-	timesync_svc->ktime_timer.data = (unsigned long)timesync_svc;
 	add_timer(&timesync_svc->ktime_timer);
 done:
 	mutex_unlock(&gb_timesync_svc_list_mutex);
-- 
2.10.2




More information about the devel mailing list