From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751807AbdJENVy (ORCPT ); Thu, 5 Oct 2017 09:21:54 -0400 Received: from terminus.zytor.com ([65.50.211.136]:51395 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751731AbdJENVw (ORCPT ); Thu, 5 Oct 2017 09:21:52 -0400 Date: Thu, 5 Oct 2017 06:06:14 -0700 From: tip-bot for Kees Cook Message-ID: Cc: len.brown@intel.com, pmladek@suse.com, oleg@redhat.com, heiko.carstens@de.ibm.com, hpa@zytor.com, tj@kernel.org, manish.chopra@cavium.com, harish.patil@cavium.com, cmetcalf@mellanox.com, ralf@linux-mips.org, jiangshanlai@gmail.com, geert@linux-m68k.org, gregkh@linuxfoundation.org, keescook@chromium.org, rjw@rjwysocki.net, tglx@linutronix.de, paulus@samba.org, mpe@ellerman.id.au, kvalo@qca.qualcomm.com, sboyd@codeaurora.org, mingo@kernel.org, stefanr@s5r6.in-berlin.de, linux-kernel@vger.kernel.org, martin.petersen@oracle.com, jejb@linux.vnet.ibm.com, arnd@arndb.de, wim@iguana.be, jwi@linux.vnet.ibm.com, schwidefsky@de.ibm.com, benh@kernel.crashing.org, mdr@sgi.com, mark.gross@intel.com, linux@roeck-us.net, sre@kernel.org, viresh.kumar@linaro.org, akpm@linux-foundation.org, sudipm.mukherjee@gmail.com, ubraun@linux.vnet.ibm.com, john.stultz@linaro.org, pavel@ucw.cz Reply-To: wim@iguana.be, arnd@arndb.de, jwi@linux.vnet.ibm.com, martin.petersen@oracle.com, jejb@linux.vnet.ibm.com, linux-kernel@vger.kernel.org, mpe@ellerman.id.au, kvalo@qca.qualcomm.com, paulus@samba.org, tglx@linutronix.de, stefanr@s5r6.in-berlin.de, sboyd@codeaurora.org, mingo@kernel.org, viresh.kumar@linaro.org, akpm@linux-foundation.org, sre@kernel.org, linux@roeck-us.net, pavel@ucw.cz, ubraun@linux.vnet.ibm.com, john.stultz@linaro.org, sudipm.mukherjee@gmail.com, mark.gross@intel.com, benh@kernel.crashing.org, mdr@sgi.com, schwidefsky@de.ibm.com, tj@kernel.org, hpa@zytor.com, pmladek@suse.com, len.brown@intel.com, heiko.carstens@de.ibm.com, oleg@redhat.com, cmetcalf@mellanox.com, rjw@rjwysocki.net, keescook@chromium.org, gregkh@linuxfoundation.org, jiangshanlai@gmail.com, ralf@linux-mips.org, geert@linux-m68k.org, harish.patil@cavium.com, manish.chopra@cavium.com In-Reply-To: <1507159627-127660-8-git-send-email-keescook@chromium.org> References: <1507159627-127660-8-git-send-email-keescook@chromium.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:timers/core] timer: Remove last user of TIMER_INITIALIZER Git-Commit-ID: 51487d9ed1e386f9f0863bbf385e5da8a586bff8 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 51487d9ed1e386f9f0863bbf385e5da8a586bff8 Gitweb: https://git.kernel.org/tip/51487d9ed1e386f9f0863bbf385e5da8a586bff8 Author: Kees Cook AuthorDate: Wed, 4 Oct 2017 16:27:01 -0700 Committer: Thomas Gleixner CommitDate: Thu, 5 Oct 2017 15:01:18 +0200 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 Signed-off-by: Thomas Gleixner Cc: linux-mips@linux-mips.org Cc: Petr Mladek Cc: Benjamin Herrenschmidt Cc: Lai Jiangshan Cc: Sebastian Reichel Cc: Kalle Valo Cc: Paul Mackerras Cc: Pavel Machek Cc: linux1394-devel@lists.sourceforge.net Cc: Chris Metcalf Cc: linux-s390@vger.kernel.org Cc: linux-wireless@vger.kernel.org Cc: Mark Gross Cc: Wim Van Sebroeck Cc: Michael Ellerman Cc: Ursula Braun Cc: Geert Uytterhoeven Cc: Viresh Kumar Cc: Harish Patil Cc: Stephen Boyd Cc: Michael Reed Cc: Manish Chopra Cc: Len Brown Cc: Arnd Bergmann Cc: linux-pm@vger.kernel.org Cc: Heiko Carstens Cc: Tejun Heo Cc: Julian Wiedmann Cc: John Stultz Cc: "James E.J. Bottomley" Cc: linux-watchdog@vger.kernel.org Cc: linux-scsi@vger.kernel.org Cc: "Martin K. Petersen" Cc: Greg Kroah-Hartman Cc: "Rafael J. Wysocki" Cc: Oleg Nesterov Cc: Ralf Baechle Cc: Stefan Richter Cc: Guenter Roeck Cc: netdev@vger.kernel.org Cc: Martin Schwidefsky Cc: Andrew Morton Cc: linuxppc-dev@lists.ozlabs.org Cc: Sudip Mukherjee Link: https://lkml.kernel.org/r/1507159627-127660-8-git-send-email-keescook@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 6210bff..8eeb419 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 10cc45c..4f7476e 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);