timer: Remove expires and data arguments from DEFINE_TIMER
Drop the arguments from the macro and adjust all callers with the following script: perl -pi -e 's/DEFINE_TIMER\((.*), 0, 0\);/DEFINE_TIMER($1);/g;' \ $(git grep DEFINE_TIMER | cut -d: -f1 | sort -u | grep -v timer.h) Signed-off-by: Kees Cook <keescook@chromium.org> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> # for m68k parts Acked-by: Guenter Roeck <linux@roeck-us.net> # for watchdog parts Acked-by: David S. Miller <davem@davemloft.net> # for networking parts Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Acked-by: Kalle Valo <kvalo@codeaurora.org> # for wireless parts Acked-by: Arnd Bergmann <arnd@arndb.de> Cc: linux-mips@linux-mips.org Cc: Petr Mladek <pmladek@suse.com> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Lai Jiangshan <jiangshanlai@gmail.com> Cc: Sebastian Reichel <sre@kernel.org> Cc: Kalle Valo <kvalo@qca.qualcomm.com> Cc: Paul Mackerras <paulus@samba.org> Cc: Pavel Machek <pavel@ucw.cz> Cc: linux1394-devel@lists.sourceforge.net Cc: Chris Metcalf <cmetcalf@mellanox.com> Cc: linux-s390@vger.kernel.org Cc: linux-wireless@vger.kernel.org Cc: "James E.J. Bottomley" <jejb@linux.vnet.ibm.com> Cc: Wim Van Sebroeck <wim@iguana.be> Cc: Michael Ellerman <mpe@ellerman.id.au> Cc: Ursula Braun <ubraun@linux.vnet.ibm.com> Cc: Viresh Kumar <viresh.kumar@linaro.org> Cc: Harish Patil <harish.patil@cavium.com> Cc: Stephen Boyd <sboyd@codeaurora.org> Cc: Michael Reed <mdr@sgi.com> Cc: Manish Chopra <manish.chopra@cavium.com> Cc: Len Brown <len.brown@intel.com> Cc: Arnd Bergmann <arnd@arndb.de> Cc: linux-pm@vger.kernel.org Cc: Heiko Carstens <heiko.carstens@de.ibm.com> Cc: Tejun Heo <tj@kernel.org> Cc: Julian Wiedmann <jwi@linux.vnet.ibm.com> Cc: John Stultz <john.stultz@linaro.org> Cc: Mark Gross <mark.gross@intel.com> Cc: linux-watchdog@vger.kernel.org Cc: linux-scsi@vger.kernel.org Cc: "Martin K. Petersen" <martin.petersen@oracle.com> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net> Cc: Oleg Nesterov <oleg@redhat.com> Cc: Ralf Baechle <ralf@linux-mips.org> Cc: Stefan Richter <stefanr@s5r6.in-berlin.de> Cc: Guenter Roeck <linux@roeck-us.net> Cc: netdev@vger.kernel.org Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: linuxppc-dev@lists.ozlabs.org Cc: Sudip Mukherjee <sudipm.mukherjee@gmail.com> Link: https://lkml.kernel.org/r/1507159627-127660-11-git-send-email-keescook@chromium.org Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:

committed by
Thomas Gleixner

parent
1ff9789745
commit
1d27e3e225
@@ -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, 0);
|
||||
static DEFINE_TIMER(timer, wdt_timer_ping);
|
||||
static unsigned long next_heartbeat;
|
||||
static unsigned long wdt_is_open;
|
||||
static char wdt_expect_close;
|
||||
|
@@ -127,7 +127,7 @@ static int zf_action = GEN_RESET;
|
||||
static unsigned long zf_is_open;
|
||||
static char zf_expect_close;
|
||||
static DEFINE_SPINLOCK(zf_port_lock);
|
||||
static DEFINE_TIMER(zf_timer, zf_ping, 0, 0);
|
||||
static DEFINE_TIMER(zf_timer, zf_ping);
|
||||
static unsigned long next_heartbeat;
|
||||
|
||||
|
||||
|
@@ -105,7 +105,7 @@ static unsigned long mixcomwd_opened; /* long req'd for setbit --RR */
|
||||
|
||||
static int watchdog_port;
|
||||
static int mixcomwd_timer_alive;
|
||||
static DEFINE_TIMER(mixcomwd_timer, mixcomwd_timerfun, 0, 0);
|
||||
static DEFINE_TIMER(mixcomwd_timer, mixcomwd_timerfun);
|
||||
static char expect_close;
|
||||
|
||||
static bool nowayout = WATCHDOG_NOWAYOUT;
|
||||
|
@@ -113,7 +113,7 @@ MODULE_PARM_DESC(nowayout,
|
||||
__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
|
||||
|
||||
static void wdt_timer_ping(unsigned long);
|
||||
static DEFINE_TIMER(timer, wdt_timer_ping, 0, 0);
|
||||
static DEFINE_TIMER(timer, wdt_timer_ping);
|
||||
static unsigned long next_heartbeat;
|
||||
static unsigned long wdt_is_open;
|
||||
static char wdt_expect_close;
|
||||
|
@@ -124,7 +124,7 @@ MODULE_PARM_DESC(nowayout,
|
||||
static __u16 __iomem *wdtmrctl;
|
||||
|
||||
static void wdt_timer_ping(unsigned long);
|
||||
static DEFINE_TIMER(timer, wdt_timer_ping, 0, 0);
|
||||
static DEFINE_TIMER(timer, wdt_timer_ping);
|
||||
static unsigned long next_heartbeat;
|
||||
static unsigned long wdt_is_open;
|
||||
static char wdt_expect_close;
|
||||
|
@@ -68,7 +68,7 @@ static struct resource wdt_res;
|
||||
static void __iomem *wdt_mem;
|
||||
static unsigned int mmio;
|
||||
static void wdt_timer_tick(unsigned long data);
|
||||
static DEFINE_TIMER(timer, wdt_timer_tick, 0, 0);
|
||||
static DEFINE_TIMER(timer, wdt_timer_tick);
|
||||
/* The timer that pings the watchdog */
|
||||
static unsigned long next_heartbeat; /* the next_heartbeat for the timer */
|
||||
|
||||
|
@@ -98,7 +98,7 @@ MODULE_PARM_DESC(nowayout,
|
||||
__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
|
||||
|
||||
static void wdt_timer_ping(unsigned long);
|
||||
static DEFINE_TIMER(timer, wdt_timer_ping, 0, 0);
|
||||
static DEFINE_TIMER(timer, wdt_timer_ping);
|
||||
static unsigned long next_heartbeat;
|
||||
static unsigned long wdt_is_open;
|
||||
static char wdt_expect_close;
|
||||
|
Reference in New Issue
Block a user