Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8ede369b authored by Kees Cook's avatar Kees Cook Committed by Thomas Gleixner
Browse files

timer: Remove expires argument from __TIMER_INITIALIZER() 



The expires field is normally initialized during the first mod_timer()
call. It was unused by all callers, so remove it from the macro.

Signed-off-by: default avatarKees Cook <keescook@chromium.org>
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: Geert Uytterhoeven <geert@linux-m68k.org>
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-12-git-send-email-keescook@chromium.org


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 1d27e3e2

include/linux/kthread.h

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ struct kthread_delayed_work { 
#define KTHREAD_DELAYED_WORK_INIT(dwork, fn) {				\

	.work = KTHREAD_WORK_INIT((dwork).work, (fn)),			\

	.timer = __TIMER_INITIALIZER(kthread_delayed_work_timer_fn,	\

				     0, (unsigned long)&(dwork),	\

				     (unsigned long)&(dwork),		\

				     TIMER_IRQSAFE),			\

	}

include/linux/timer.h

+2 −3
Original line number Diff line number Diff line
@@ -63,10 +63,9 @@ struct timer_list { 


#define TIMER_TRACE_FLAGMASK	(TIMER_MIGRATING | TIMER_DEFERRABLE | TIMER_PINNED | TIMER_IRQSAFE)



#define __TIMER_INITIALIZER(_function, _expires, _data, _flags) { \

#define __TIMER_INITIALIZER(_function, _data, _flags) {		\

		.entry = { .next = TIMER_ENTRY_STATIC },	\

		.function = (_function),			\

		.expires = (_expires),				\

		.data = (_data),				\

		.flags = (_flags),				\

		__TIMER_LOCKDEP_MAP_INITIALIZER(		\
@@ -75,7 +74,7 @@ struct timer_list { 


#define DEFINE_TIMER(_name, _function)				\

	struct timer_list _name =				\

		__TIMER_INITIALIZER(_function, 0, 0, 0)

		__TIMER_INITIALIZER(_function, 0, 0)



void init_timer_key(struct timer_list *timer, unsigned int flags,

		    const char *name, struct lock_class_key *key);

include/linux/workqueue.h

+1 −1
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ struct execute_work { 
#define __DELAYED_WORK_INITIALIZER(n, f, tflags) {			\

	.work = __WORK_INITIALIZER((n).work, (f)),			\

	.timer = __TIMER_INITIALIZER(delayed_work_timer_fn,		\

				     0, (unsigned long)&(n),		\

				     (unsigned long)&(n),		\

				     (tflags) | TIMER_IRQSAFE),		\

	}