Commit 1ff97897 authored by Kees Cook's avatar Kees Cook Committed by Thomas Gleixner

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: default avatarKees Cook <>
Signed-off-by: default avatarThomas Gleixner <>
Acked-by: Guenter Roeck <> # for watchdog parts
Cc: Petr Mladek <>
Cc: Benjamin Herrenschmidt <>
Cc: Lai Jiangshan <>
Cc: Oleg Nesterov <>
Cc: Wim Van Sebroeck <>
Cc: Paul Mackerras <>
Cc: Pavel Machek <>
Cc: "James E.J. Bottomley" <>
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: Heiko Carstens <>
Cc: Tejun Heo <>
Cc: Julian Wiedmann <>
Cc: John Stultz <>
Cc: Sebastian Reichel <>
Cc: Mark Gross <>
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: Martin Schwidefsky <>
Cc: Andrew Morton <>
Cc: Sudip Mukherjee <>
parent fca7ce5b
......@@ -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)
if (display_count == max_display_count)
......@@ -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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment