[PATCH 07/13] timer: Remove last user of TIMER_INITIALIZER

[Gross, Mark]

Acked-by: mark gross <mark.gross at intel.com>

--mark

> -----Original Message-----
> From: Kees Cook [mailto:keescook at chromium.org]
> Sent: Wednesday, October 4, 2017 4:27 PM
> To: Thomas Gleixner <tglx at linutronix.de>
> Cc: Kees Cook <keescook at chromium.org>; Arnd Bergmann <arnd at arndb.de>;
> Greg Kroah-Hartman <gregkh at linuxfoundation.org>; Gross, Mark
> <mark.gross at intel.com>; Andrew Morton <akpm at linux-foundation.org>;
> Benjamin Herrenschmidt <benh at kernel.crashing.org>; Chris Metcalf
> <cmetcalf at mellanox.com>; Geert Uytterhoeven <geert at linux-m68k.org>;
> Guenter Roeck <linux at roeck-us.net>; Harish Patil <harish.patil at cavium.com>;
> Heiko Carstens <heiko.carstens at de.ibm.com>; James E.J. Bottomley
> <jejb at linux.vnet.ibm.com>; John Stultz <john.stultz at linaro.org>; Julian
> Wiedmann <jwi at linux.vnet.ibm.com>; Kalle Valo <kvalo at qca.qualcomm.com>;
> Lai Jiangshan <jiangshanlai at gmail.com>; Brown, Len <len.brown at intel.com>;
> Manish Chopra <manish.chopra at cavium.com>; Martin K. Petersen
> <martin.petersen at oracle.com>; Martin Schwidefsky
> <schwidefsky at de.ibm.com>; Michael Ellerman <mpe at ellerman.id.au>; Michael
> Reed <mdr at sgi.com>; netdev at vger.kernel.org; Oleg Nesterov
> <oleg at redhat.com>; Paul Mackerras <paulus at samba.org>; Pavel Machek
> <pavel at ucw.cz>; Petr Mladek <pmladek at suse.com>; Rafael J. Wysocki
> <rjw at rjwysocki.net>; Ralf Baechle <ralf at linux-mips.org>; Sebastian Reichel
> <sre at kernel.org>; Stefan Richter <stefanr at s5r6.in-berlin.de>; Stephen Boyd
> <sboyd at codeaurora.org>; Sudip Mukherjee <sudipm.mukherjee at gmail.com>;
> Tejun Heo <tj at kernel.org>; Ursula Braun <ubraun at linux.vnet.ibm.com>; Viresh
> Kumar <viresh.kumar at linaro.org>; Wim Van Sebroeck <wim at iguana.be>;
> linux1394-devel at lists.sourceforge.net; linux-mips at linux-mips.org; linux-
> pm at vger.kernel.org; linuxppc-dev at lists.ozlabs.org; linux-
> s390 at vger.kernel.org; linux-scsi at vger.kernel.org; linux-
> watchdog at vger.kernel.org; linux-wireless at vger.kernel.org; linux-
> kernel at vger.kernel.org
> Subject: [PATCH 07/13] timer: Remove last user of TIMER_INITIALIZER
> 
> Drops the last user of TIMER_INITIALIZER and adapts timer.h to use the internal
> version.
> 
> Cc: Arnd Bergmann <arnd at arndb.de>
> Cc: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
> Cc: Mark Gross <mark.gross at intel.com>
> Cc: Thomas Gleixner <tglx at linutronix.de>
> Signed-off-by: Kees Cook <keescook at chromium.org>
> ---
>  drivers/char/tlclk.c  | 12 +++++-------  include/linux/timer.h |  2 +-
>  2 files changed, 6 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/char/tlclk.c b/drivers/char/tlclk.c index
> 6210bff46341..8eeb4190207d 100644
> --- a/drivers/char/tlclk.c
> +++ b/drivers/char/tlclk.c
> @@ -184,9 +184,8 @@ static unsigned int telclk_interrupt;
>  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; @@ -805,7 +804,7 @@ static int
> __init tlclk_init(void)
>  		goto out3;
>  	}
> 
> -	init_timer(&switchover_timer);
> +	timer_setup(&switchover_timer, switchover_timeout, 0);
> 
>  	ret = misc_register(&tlclk_miscdev);
>  	if (ret < 0) {
> @@ -855,9 +854,9 @@ static void __exit tlclk_cleanup(void)
> 
>  }
> 
> -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)) @@ -922,7
> +921,6 @@ static irqreturn_t tlclk_interrupt(int irq, void *dev_id)
>  		/* 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;
> diff --git a/include/linux/timer.h b/include/linux/timer.h index
> 10cc45ca5803..4f7476e4a727 100644
> --- a/include/linux/timer.h
> +++ b/include/linux/timer.h
> @@ -87,7 +87,7 @@ struct timer_list {
> 
>  #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);
> --
> 2.7.4