Return-path: Received: from mail-pg0-f68.google.com ([74.125.83.68]:36430 "EHLO mail-pg0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750951AbdJEAM1 (ORCPT ); Wed, 4 Oct 2017 20:12:27 -0400 Subject: Re: [PATCH 09/13] timer: Remove users of expire and data arguments to DEFINE_TIMER To: Kees Cook , Thomas Gleixner Cc: Ralf Baechle , Wim Van Sebroeck , Geert Uytterhoeven , linux-mips@linux-mips.org, linux-watchdog@vger.kernel.org, Andrew Morton , Arnd Bergmann , Benjamin Herrenschmidt , Chris Metcalf , Greg Kroah-Hartman , Harish Patil , Heiko Carstens , "James E.J. Bottomley" , John Stultz , Julian Wiedmann , Kalle Valo , Lai Jiangshan , Len Brown , Manish Chopra , Mark Gross , "Martin K. Petersen" , Martin Schwidefsky , Michael Ellerman , Michael Reed , netdev@vger.kernel.org, Oleg Nesterov , Paul Mackerras , Pavel Machek , Petr Mladek , "Rafael J. Wysocki" , Sebastian Reichel , Stefan Richter , Stephen Boyd , Sudip Mukherjee , Tejun Heo , Ursula Braun , Viresh Kumar , linux1394-devel@lists.sourceforge.net, linux-pm@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, linux-scsi@vger.kernel.org, linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org References: <1507159627-127660-1-git-send-email-keescook@chromium.org> <1507159627-127660-10-git-send-email-keescook@chromium.org> From: Guenter Roeck Message-ID: <8219ece3-429a-1a25-1fd5-5ee5bacde53c@roeck-us.net> (sfid-20171005_021237_760429_1FB93BBC) Date: Wed, 4 Oct 2017 17:12:21 -0700 MIME-Version: 1.0 In-Reply-To: <1507159627-127660-10-git-send-email-keescook@chromium.org> Content-Type: text/plain; charset=utf-8; format=flowed Sender: linux-wireless-owner@vger.kernel.org List-ID: On 10/04/2017 04:27 PM, Kees Cook wrote: > 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. > > Cc: Ralf Baechle > Cc: Wim Van Sebroeck > Cc: Guenter Roeck > Cc: Geert Uytterhoeven > Cc: linux-mips@linux-mips.org > Cc: linux-watchdog@vger.kernel.org > Signed-off-by: Kees Cook For watchdog: Acked-by: Guenter Roeck > --- > 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 d4f807191ecd..ac813158b9b8 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 665e0e7dfe1e..3c1f6ac68ea9 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 >