From: Guenter Roeck <linux@roeck-us.net>
To: Kees Cook <keescook@chromium.org>, Thomas Gleixner <tglx@linutronix.de>
Cc: Ralf Baechle <ralf@linux-mips.org>,
Wim Van Sebroeck <wim@iguana.be>,
Geert Uytterhoeven <geert@linux-m68k.org>,
linux-mips@linux-mips.org, linux-watchdog@vger.kernel.org,
Andrew Morton <akpm@linux-foundation.org>,
Arnd Bergmann <arnd@arndb.de>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Chris Metcalf <cmetcalf@mellanox.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Harish Patil <harish.patil@cavium.com>,
Heiko Carstens <heiko.carstens@de.ibm.com>,
"James E.J. Bottomley" <jejb@linux.vnet.ibm.com>,
John Stultz <john.stultz@linaro.org>,
Julian Wiedmann <jwi@linux.vnet.ibm.com>,
Kalle Valo <kvalo@qca.qualcomm.com>,
Lai Jiangshan <jiangshanlai@gmail.com>,
Len Brown <len.brown@intel.com>,
Manish Chopra <manish.chopra@cavium.com>,
Mark Gross <mark.gross@intel.com>,
"Martin K. Petersen" <martin.petersen@oracle.com>,
Martin Schwidefsky <schwidefsky@de.ibm.com>,
Michael Ellerman <mpe@ellerman.id.au>, Michael Reed <mdr@sgi.com>,
netdev@vger.kernel.org, Oleg Nesterov <oleg@redhat.com>,
Paul Mackerras <paulus@samba.org>, Pavel Machek <pavel@ucw.cz>,
Petr Mladek <pmladek@suse.com>,
"Rafael J. Wysocki" <rjw@rjwysocki.net>,
Sebastian Reichel <sre@kernel.org>,
Stefan Richter <stefanr@s5r6.in-berlin.de>,
Stephen Boyd <sboyd@codeaurora.org>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Tejun Heo <tj@kernel.org>,
Ursula Braun <ubraun@linux.vnet.ibm.com>,
Viresh Kumar <viresh.kumar@linaro.org>,
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
Subject: Re: [PATCH 09/13] timer: Remove users of expire and data arguments to DEFINE_TIMER
Date: Wed, 4 Oct 2017 17:12:21 -0700 [thread overview]
Message-ID: <8219ece3-429a-1a25-1fd5-5ee5bacde53c@roeck-us.net> (raw)
In-Reply-To: <1507159627-127660-10-git-send-email-keescook@chromium.org>
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 <ralf@linux-mips.org>
> Cc: Wim Van Sebroeck <wim@iguana.be>
> Cc: Guenter Roeck <linux@roeck-us.net>
> Cc: Geert Uytterhoeven <geert@linux-m68k.org>
> Cc: linux-mips@linux-mips.org
> Cc: linux-watchdog@vger.kernel.org
> Signed-off-by: Kees Cook <keescook@chromium.org>
For watchdog:
Acked-by: Guenter Roeck <linux@roeck-us.net>
> ---
> 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
>
next prev parent reply other threads:[~2017-10-05 0:12 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-04 23:26 [PATCH 00/13] timer: Start conversion to timer_setup() Kees Cook
2017-10-04 23:26 ` [PATCH 01/13] timer: Convert schedule_timeout() to use from_timer() Kees Cook
2017-10-04 23:26 ` [PATCH 02/13] timer: Remove init_timer_pinned_deferrable() in favor of timer_setup() Kees Cook
2017-10-04 23:26 ` [PATCH 03/13] timer: Remove init_timer_on_stack() in favor of timer_setup_on_stack() Kees Cook
2017-10-05 13:18 ` Rafael J. Wysocki
2017-10-05 13:18 ` Rafael J. Wysocki
2017-10-04 23:26 ` [PATCH 04/13] timer: Remove init_timer_pinned() in favor of timer_setup() Kees Cook
2017-10-05 0:41 ` David Miller
2017-10-04 23:26 ` [PATCH 05/13] timer: Remove init_timer_deferrable() " Kees Cook
2017-10-05 0:41 ` David Miller
2017-10-05 1:02 ` Sebastian Reichel
2017-10-04 23:27 ` [PATCH 06/13] timer: Remove users of TIMER_DEFERRED_INITIALIZER Kees Cook
2017-10-04 23:27 ` [PATCH 07/13] timer: Remove last user of TIMER_INITIALIZER Kees Cook
2017-10-05 22:39 ` Gross, Mark
2017-10-05 22:39 ` Gross, Mark
2017-10-04 23:27 ` [PATCH 08/13] timer: Remove unused static initializer macros Kees Cook
2017-10-04 23:27 ` [PATCH 09/13] timer: Remove users of expire and data arguments to DEFINE_TIMER Kees Cook
2017-10-05 0:12 ` Guenter Roeck [this message]
2017-10-09 13:23 ` Ralf Baechle
2017-10-04 23:27 ` [PATCH 10/13] timer: Remove expires and data arguments from DEFINE_TIMER Kees Cook
2017-10-05 0:13 ` Guenter Roeck
2017-10-05 0:40 ` David Miller
2017-10-05 5:28 ` Greg Kroah-Hartman
2017-10-05 6:54 ` Kalle Valo
2017-10-05 6:54 ` Kalle Valo
2017-10-05 8:59 ` Arnd Bergmann
2017-10-09 13:27 ` Ralf Baechle
2017-10-04 23:27 ` [PATCH 11/13] timer: Remove expires argument from __TIMER_INITIALIZER() Kees Cook
2017-10-11 10:15 ` Petr Mladek
2017-10-04 23:27 ` [PATCH 12/13] kthread: Convert callback to use from_timer() Kees Cook
2017-10-11 10:20 ` Petr Mladek
2017-10-04 23:27 ` [PATCH 13/13] workqueue: " Kees Cook
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8219ece3-429a-1a25-1fd5-5ee5bacde53c@roeck-us.net \
--to=linux@roeck-us.net \
--cc=akpm@linux-foundation.org \
--cc=arnd@arndb.de \
--cc=benh@kernel.crashing.org \
--cc=cmetcalf@mellanox.com \
--cc=geert@linux-m68k.org \
--cc=gregkh@linuxfoundation.org \
--cc=harish.patil@cavium.com \
--cc=heiko.carstens@de.ibm.com \
--cc=jejb@linux.vnet.ibm.com \
--cc=jiangshanlai@gmail.com \
--cc=john.stultz@linaro.org \
--cc=jwi@linux.vnet.ibm.com \
--cc=keescook@chromium.org \
--cc=kvalo@qca.qualcomm.com \
--cc=len.brown@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=linux1394-devel@lists.sourceforge.net \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=manish.chopra@cavium.com \
--cc=mark.gross@intel.com \
--cc=martin.petersen@oracle.com \
--cc=mdr@sgi.com \
--cc=mpe@ellerman.id.au \
--cc=netdev@vger.kernel.org \
--cc=oleg@redhat.com \
--cc=paulus@samba.org \
--cc=pavel@ucw.cz \
--cc=pmladek@suse.com \
--cc=ralf@linux-mips.org \
--cc=rjw@rjwysocki.net \
--cc=sboyd@codeaurora.org \
--cc=schwidefsky@de.ibm.com \
--cc=sre@kernel.org \
--cc=stefanr@s5r6.in-berlin.de \
--cc=sudipm.mukherjee@gmail.com \
--cc=tglx@linutronix.de \
--cc=tj@kernel.org \
--cc=ubraun@linux.vnet.ibm.com \
--cc=viresh.kumar@linaro.org \
--cc=wim@iguana.be \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).