timer: Remove last user of TIMER_INITIALIZER

Drops the last user of TIMER_INITIALIZER and adapts timer.h to use the
internal version.

Signed-off-by: Kees Cook <[e-mail]>
Signed-off-by: Thomas Gleixner <[e-mail]>
Cc: [e-mail]
Cc: Petr Mladek <[e-mail]>
Cc: Benjamin Herrenschmidt <[e-mail]>
Cc: Lai Jiangshan <[e-mail]>
Cc: Sebastian Reichel <[e-mail]>
Cc: Kalle Valo <[e-mail]>
Cc: Paul Mackerras <[e-mail]>
Cc: Pavel Machek <[e-mail]>
Cc: [e-mail]
Cc: Chris Metcalf <[e-mail]>
Cc: [e-mail]
Cc: [e-mail]
Cc: Mark Gross <[e-mail]>
Cc: Wim Van Sebroeck <[e-mail]>
Cc: Michael Ellerman <[e-mail]>
Cc: Ursula Braun <[e-mail]>
Cc: Geert Uytterhoeven <[e-mail]>
Cc: Viresh Kumar <[e-mail]>
Cc: Harish Patil <[e-mail]>
Cc: Stephen Boyd <[e-mail]>
Cc: Michael Reed <[e-mail]>
Cc: Manish Chopra <[e-mail]>
Cc: Len Brown <[e-mail]>
Cc: Arnd Bergmann <[e-mail]>
Cc: [e-mail]
Cc: Heiko Carstens <[e-mail]>
Cc: Tejun Heo <[e-mail]>
Cc: Julian Wiedmann <[e-mail]>
Cc: John Stultz <[e-mail]>
Cc: "James E.J. Bottomley" <[e-mail]>
Cc: [e-mail]
Cc: [e-mail]
Cc: "Martin K. Petersen" <[e-mail]>
Cc: Greg Kroah-Hartman <[e-mail]>
Cc: "Rafael J. Wysocki" <[e-mail]>
Cc: Oleg Nesterov <[e-mail]>
Cc: Ralf Baechle <[e-mail]>
Cc: Stefan Richter <[e-mail]>
Cc: Guenter Roeck <[e-mail]>
Cc: [e-mail]
Cc: Martin Schwidefsky <[e-mail]>
Cc: Andrew Morton <[e-mail]>
Cc: [e-mail]
Cc: Sudip Mukherjee <[e-mail]>
Link: https://lkml.kernel.org/r/[e-mail]

drivers/char/tlclk.c

···
 static int int_events;		/* Event that generate a interrupt */
 static int got_event;		/* if events processing have been done */
 
-static void switchover_timeout(unsigned long data);
-static struct timer_list switchover_timer =
-	TIMER_INITIALIZER(switchover_timeout , 0, 0);
+static void switchover_timeout(struct timer_list *t);
+static struct timer_list switchover_timer;
 static unsigned long tlclk_timer_data;
 
 static struct tlclk_alarms *alarm_events;
···
 		goto out3;
 	}
 
-	init_timer(&switchover_timer);
+	timer_setup(&switchover_timer, switchover_timeout, 0);
 
 	ret = misc_register(&tlclk_miscdev);
 	if (ret < 0) {
···
 
 }
 
-static void switchover_timeout(unsigned long data)
+static void switchover_timeout(struct timer_list *unused)
 {
-	unsigned long flags = *(unsigned long *) data;
+	unsigned long flags = tlclk_timer_data;
 
 	if ((flags & 1)) {
 		if ((inb(TLCLK_REG1) & 0x08) != (flags & 0x08))
···
 		/* TIMEOUT in ~10ms */
 		switchover_timer.expires = jiffies + msecs_to_jiffies(10);
 		tlclk_timer_data = inb(TLCLK_REG1);
-		switchover_timer.data = (unsigned long) &tlclk_timer_data;
 		mod_timer(&switchover_timer, switchover_timer.expires);
 	} else {
 		got_event = 1;

include/linux/timer.h

···
 
 #define DEFINE_TIMER(_name, _function, _expires, _data)		\
 	struct timer_list _name =				\
-		TIMER_INITIALIZER(_function, _expires, _data)
+		__TIMER_INITIALIZER(_function, _expires, _data, 0)
 
 void init_timer_key(struct timer_list *timer, unsigned int flags,
 		    const char *name, struct lock_class_key *key);