From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751639AbdJENV2 (ORCPT ); Thu, 5 Oct 2017 09:21:28 -0400 Received: from terminus.zytor.com ([65.50.211.136]:52805 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751326AbdJENV0 (ORCPT ); Thu, 5 Oct 2017 09:21:26 -0400 Date: Thu, 5 Oct 2017 06:07:01 -0700 From: tip-bot for Kees Cook Message-ID: Cc: linux-kernel@vger.kernel.org, stefanr@s5r6.in-berlin.de, ubraun@linux.vnet.ibm.com, akpm@linux-foundation.org, mdr@sgi.com, benh@kernel.crashing.org, manish.chopra@cavium.com, john.stultz@linaro.org, rjw@rjwysocki.net, wim@iguana.be, sboyd@codeaurora.org, viresh.kumar@linaro.org, jwi@linux.vnet.ibm.com, keescook@chromium.org, pmladek@suse.com, linux@roeck-us.net, sudipm.mukherjee@gmail.com, heiko.carstens@de.ibm.com, jiangshanlai@gmail.com, hpa@zytor.com, martin.petersen@oracle.com, len.brown@intel.com, cmetcalf@mellanox.com, tj@kernel.org, gregkh@linuxfoundation.org, tglx@linutronix.de, mpe@ellerman.id.au, oleg@redhat.com, sre@kernel.org, jejb@linux.vnet.ibm.com, arnd@arndb.de, paulus@samba.org, kvalo@qca.qualcomm.com, ralf@linux-mips.org, harish.patil@cavium.com, schwidefsky@de.ibm.com, geert@linux-m68k.org, pavel@ucw.cz, mark.gross@intel.com, mingo@kernel.org Reply-To: mark.gross@intel.com, pavel@ucw.cz, geert@linux-m68k.org, schwidefsky@de.ibm.com, harish.patil@cavium.com, ralf@linux-mips.org, kvalo@qca.qualcomm.com, mingo@kernel.org, oleg@redhat.com, sre@kernel.org, mpe@ellerman.id.au, gregkh@linuxfoundation.org, tglx@linutronix.de, tj@kernel.org, paulus@samba.org, arnd@arndb.de, jejb@linux.vnet.ibm.com, martin.petersen@oracle.com, jiangshanlai@gmail.com, hpa@zytor.com, heiko.carstens@de.ibm.com, sudipm.mukherjee@gmail.com, keescook@chromium.org, pmladek@suse.com, linux@roeck-us.net, jwi@linux.vnet.ibm.com, cmetcalf@mellanox.com, len.brown@intel.com, john.stultz@linaro.org, manish.chopra@cavium.com, mdr@sgi.com, benh@kernel.crashing.org, akpm@linux-foundation.org, ubraun@linux.vnet.ibm.com, stefanr@s5r6.in-berlin.de, linux-kernel@vger.kernel.org, viresh.kumar@linaro.org, sboyd@codeaurora.org, wim@iguana.be, rjw@rjwysocki.net In-Reply-To: <1507159627-127660-10-git-send-email-keescook@chromium.org> References: <1507159627-127660-10-git-send-email-keescook@chromium.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:timers/core] timer: Remove users of expire and data arguments to DEFINE_TIMER Git-Commit-ID: 1ff97897454b9a59edc7cf2cf2d95586b1e7a2cf 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: 1ff97897454b9a59edc7cf2cf2d95586b1e7a2cf Gitweb: https://git.kernel.org/tip/1ff97897454b9a59edc7cf2cf2d95586b1e7a2cf Author: Kees Cook AuthorDate: Wed, 4 Oct 2017 16:27:03 -0700 Committer: Thomas Gleixner CommitDate: Thu, 5 Oct 2017 15:01:20 +0200 timer: Remove users of expire and data arguments to DEFINE_TIMER The expire and data arguments of DEFINE_TIMER are only used in two places and are ignored by the code (malta-display.c only uses mod_timer(), never add_timer(), so the preset expires value is ignored). Set both sets of arguments to zero. Signed-off-by: Kees Cook Signed-off-by: Thomas Gleixner Acked-by: Guenter Roeck # for watchdog parts Cc: linux-mips@linux-mips.org Cc: Petr Mladek Cc: Benjamin Herrenschmidt Cc: Lai Jiangshan Cc: Oleg Nesterov Cc: Wim Van Sebroeck Cc: Paul Mackerras Cc: Pavel Machek Cc: linux1394-devel@lists.sourceforge.net Cc: linux-s390@vger.kernel.org Cc: linux-wireless@vger.kernel.org Cc: "James E.J. Bottomley" Cc: linux-scsi@vger.kernel.org Cc: Michael Ellerman Cc: Ursula Braun Cc: Geert Uytterhoeven Cc: Viresh Kumar Cc: Harish Patil Cc: Stephen Boyd Cc: Guenter Roeck Cc: Manish Chopra Cc: Len Brown Cc: Chris Metcalf Cc: Arnd Bergmann Cc: linux-pm@vger.kernel.org Cc: Heiko Carstens Cc: Tejun Heo Cc: Julian Wiedmann Cc: John Stultz Cc: Sebastian Reichel Cc: Mark Gross Cc: linux-watchdog@vger.kernel.org Cc: "Martin K. Petersen" Cc: Greg Kroah-Hartman Cc: "Rafael J. Wysocki" Cc: Kalle Valo Cc: Ralf Baechle Cc: Stefan Richter Cc: Michael Reed 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-10-git-send-email-keescook@chromium.org --- arch/mips/mti-malta/malta-display.c | 6 +++--- drivers/watchdog/alim7101_wdt.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/mips/mti-malta/malta-display.c b/arch/mips/mti-malta/malta-display.c index d4f8071..ac81315 100644 --- a/arch/mips/mti-malta/malta-display.c +++ b/arch/mips/mti-malta/malta-display.c @@ -36,10 +36,10 @@ void mips_display_message(const char *str) } } -static void scroll_display_message(unsigned long data); -static DEFINE_TIMER(mips_scroll_timer, scroll_display_message, HZ, 0); +static void scroll_display_message(unsigned long unused); +static DEFINE_TIMER(mips_scroll_timer, scroll_display_message, 0, 0); -static void scroll_display_message(unsigned long data) +static void scroll_display_message(unsigned long unused) { mips_display_message(&display_string[display_count++]); if (display_count == max_display_count) diff --git a/drivers/watchdog/alim7101_wdt.c b/drivers/watchdog/alim7101_wdt.c index 665e0e7..3c1f6ac 100644 --- a/drivers/watchdog/alim7101_wdt.c +++ b/drivers/watchdog/alim7101_wdt.c @@ -71,7 +71,7 @@ MODULE_PARM_DESC(use_gpio, "Use the gpio watchdog (required by old cobalt boards)."); static void wdt_timer_ping(unsigned long); -static DEFINE_TIMER(timer, wdt_timer_ping, 0, 1); +static DEFINE_TIMER(timer, wdt_timer_ping, 0, 0); static unsigned long next_heartbeat; static unsigned long wdt_is_open; static char wdt_expect_close; @@ -87,7 +87,7 @@ MODULE_PARM_DESC(nowayout, * Whack the dog */ -static void wdt_timer_ping(unsigned long data) +static void wdt_timer_ping(unsigned long unused) { /* If we got a heartbeat pulse within the WDT_US_INTERVAL * we agree to ping the WDT