From: Stefan Svinciak <xsvinc1@fi.muni.cz>
Date: Wed, 15 Feb 2017 16:04:26 +0000 (+0100)
Subject: staging: visorbus, replace init_timer with setup_timer
X-Git-Tag: v4.11-rc1~116^2~17
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=614dd644cbacb6a0ad0f1f746e75ec3887ed18bb;p=linux.git

staging: visorbus, replace init_timer with setup_timer

Newer version is more readable and needs less changes if/when
timer_struct is to be changed.

Signed-off-by: Stefan Svinciak <xsvinc1@fi.muni.cz>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: David Kershner <david.kershner@unisys.com>
Cc: <sparmaintainer@unisys.com>
Acked-by: David Kershner <david.kershner@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/unisys/visorbus/visorbus_main.c b/drivers/staging/unisys/visorbus/visorbus_main.c
index aea1aa262b28..55f29ae8e015 100644
--- a/drivers/staging/unisys/visorbus/visorbus_main.c
+++ b/drivers/staging/unisys/visorbus/visorbus_main.c
@@ -623,9 +623,7 @@ create_visor_device(struct visor_device *dev)
 	dev->device.release = visorbus_release_device;
 	/* keep a reference just for us (now 2) */
 	get_device(&dev->device);
-	init_timer(&dev->timer);
-	dev->timer.data = (unsigned long)(dev);
-	dev->timer.function = dev_periodic_work;
+	setup_timer(&dev->timer, dev_periodic_work, (unsigned long)dev);
 
 	/*
 	 * bus_id must be a unique name with respect to this bus TYPE