Commit-ID: 1ff97897454b9a59edc7cf2cf2d95586b1e7a2cf Gitweb: https://git.kernel.org/tip/1ff97897454b9a59edc7cf2cf2d95586b1e7a2cf Author: Kees Cook <keesc...@chromium.org> AuthorDate: Wed, 4 Oct 2017 16:27:03 -0700 Committer: Thomas Gleixner <t...@linutronix.de> 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 <keesc...@chromium.org> Signed-off-by: Thomas Gleixner <t...@linutronix.de> Acked-by: Guenter Roeck <li...@roeck-us.net> # for watchdog parts Cc: linux-m...@linux-mips.org Cc: Petr Mladek <pmla...@suse.com> Cc: Benjamin Herrenschmidt <b...@kernel.crashing.org> Cc: Lai Jiangshan <jiangshan...@gmail.com> Cc: Oleg Nesterov <o...@redhat.com> Cc: Wim Van Sebroeck <w...@iguana.be> Cc: Paul Mackerras <pau...@samba.org> Cc: Pavel Machek <pa...@ucw.cz> Cc: linux1394-de...@lists.sourceforge.net Cc: linux-s...@vger.kernel.org Cc: linux-wirel...@vger.kernel.org Cc: "James E.J. Bottomley" <j...@linux.vnet.ibm.com> Cc: linux-s...@vger.kernel.org Cc: Michael Ellerman <m...@ellerman.id.au> Cc: Ursula Braun <ubr...@linux.vnet.ibm.com> Cc: Geert Uytterhoeven <ge...@linux-m68k.org> Cc: Viresh Kumar <viresh.ku...@linaro.org> Cc: Harish Patil <harish.pa...@cavium.com> Cc: Stephen Boyd <sb...@codeaurora.org> Cc: Guenter Roeck <li...@roeck-us.net> Cc: Manish Chopra <manish.cho...@cavium.com> Cc: Len Brown <len.br...@intel.com> Cc: Chris Metcalf <cmetc...@mellanox.com> Cc: Arnd Bergmann <a...@arndb.de> Cc: linux...@vger.kernel.org Cc: Heiko Carstens <heiko.carst...@de.ibm.com> Cc: Tejun Heo <t...@kernel.org> Cc: Julian Wiedmann <j...@linux.vnet.ibm.com> Cc: John Stultz <john.stu...@linaro.org> Cc: Sebastian Reichel <s...@kernel.org> Cc: Mark Gross <mark.gr...@intel.com> Cc: linux-watch...@vger.kernel.org Cc: "Martin K. Petersen" <martin.peter...@oracle.com> Cc: Greg Kroah-Hartman <gre...@linuxfoundation.org> Cc: "Rafael J. Wysocki" <r...@rjwysocki.net> Cc: Kalle Valo <kv...@qca.qualcomm.com> Cc: Ralf Baechle <r...@linux-mips.org> Cc: Stefan Richter <stef...@s5r6.in-berlin.de> Cc: Michael Reed <m...@sgi.com> Cc: net...@vger.kernel.org Cc: Martin Schwidefsky <schwidef...@de.ibm.com> Cc: Andrew Morton <a...@linux-foundation.org> Cc: linuxppc-...@lists.ozlabs.org Cc: Sudip Mukherjee <sudipm.mukher...@gmail.com> Link: https://lkml.kernel.org/r/1507159627-127660-10-git-send-email-keesc...@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
