From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga11.intel.com ([192.55.52.93]:20873 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by eddie.linux-mips.org with ESMTP id S23993637AbdJEWj46OXbw convert rfc822-to-8bit (ORCPT ); Fri, 6 Oct 2017 00:39:56 +0200 From: "Gross, Mark" Subject: RE: [PATCH 07/13] timer: Remove last user of TIMER_INITIALIZER Date: Thu, 5 Oct 2017 22:39:51 +0000 Message-ID: References: <1507159627-127660-1-git-send-email-keescook@chromium.org> <1507159627-127660-8-git-send-email-keescook@chromium.org> In-Reply-To: <1507159627-127660-8-git-send-email-keescook@chromium.org> Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 8BIT MIME-Version: 1.0 Return-Path: Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org List-help: List-unsubscribe: List-software: Ecartis version 1.0.0 List-subscribe: List-owner: List-post: List-archive: To: Kees Cook , Thomas Gleixner Cc: Arnd Bergmann , Greg Kroah-Hartman , Andrew Morton , Benjamin Herrenschmidt , Chris Metcalf , Geert Uytterhoeven , Guenter Roeck , Harish Patil , Heiko Carstens , "James E.J. Bottomley" , John Stultz , Julian Wiedmann , Kalle Valo , Lai Jiangshan , "Brown, Len" , Manish Chopra , "Martin K. Petersen" , Martin Schwidefsky , Michael Ellerman , Michael Reed , "netdev@vger.kernel.org" , Oleg Nesterov , Paul Mackerras , Pavel Machek , Petr Mladek , "Rafael J. Wysocki" , Ralf Baechle , Sebastian Reichel , Stefan Richter , Stephen Boyd , Sudip Mukherjee , Tejun Heo , Ursula Braun , Viresh Kumar , Wim Van Sebroeck , "linux1394-devel@lists.sourceforge.net" , "linux-mips@linux-mips.org" , "linux-pm@vger.kernel.org" , "linuxppc-dev@lists.ozlabs.org" , "linux-s390@vger.kernel.org" , "linux-scsi@vger.kernel.org" , "linux-watchdog@vger.kernel.org" , "linux-wireless@vger.kernel.org" , "linux-kernel@vger.kernel.org" Message-ID: <20171005223951.w_bl92NzbR9bO7yWsI-s0wqvrhmb6mW4CwXACoKvwd0@z> Acked-by: mark gross --mark > -----Original Message----- > From: Kees Cook [mailto:keescook@chromium.org] > Sent: Wednesday, October 4, 2017 4:27 PM > To: Thomas Gleixner > Cc: Kees Cook ; Arnd Bergmann ; > Greg Kroah-Hartman ; Gross, Mark > ; Andrew Morton ; > Benjamin Herrenschmidt ; Chris Metcalf > ; Geert Uytterhoeven ; > Guenter Roeck ; Harish Patil ; > Heiko Carstens ; James E.J. Bottomley > ; John Stultz ; Julian > Wiedmann ; Kalle Valo ; > Lai Jiangshan ; Brown, Len ; > Manish Chopra ; Martin K. Petersen > ; Martin Schwidefsky > ; Michael Ellerman ; Michael > Reed ; netdev@vger.kernel.org; Oleg Nesterov > ; Paul Mackerras ; Pavel Machek > ; Petr Mladek ; Rafael J. Wysocki > ; Ralf Baechle ; Sebastian Reichel > ; Stefan Richter ; Stephen Boyd > ; Sudip Mukherjee ; > Tejun Heo ; Ursula Braun ; Viresh > Kumar ; Wim Van Sebroeck ; > linux1394-devel@lists.sourceforge.net; linux-mips@linux-mips.org; linux- > pm@vger.kernel.org; linuxppc-dev@lists.ozlabs.org; linux- > s390@vger.kernel.org; linux-scsi@vger.kernel.org; linux- > watchdog@vger.kernel.org; linux-wireless@vger.kernel.org; linux- > kernel@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 > Cc: Greg Kroah-Hartman > Cc: Mark Gross > Cc: Thomas Gleixner > Signed-off-by: Kees Cook > --- > 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