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

Commit 1fe66ba5 authored by Kees Cook's avatar Kees Cook
Browse files

timer: Remove unused data arguments from macros 



With the .data field removed, the ignored data arguments in timer macros
can be removed.

Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Tejun Heo <tj@kernel.org>
Cc: Lai Jiangshan <jiangshanlai@gmail.com>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Shaohua Li <shli@fb.com>
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
parent 354b46b1

include/linux/kthread.h

+0 −2
Original line number Diff line number Diff line
@@ -119,7 +119,6 @@ struct kthread_delayed_work { 
#define KTHREAD_DELAYED_WORK_INIT(dwork, fn) {				\

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

	.timer = __TIMER_INITIALIZER((TIMER_FUNC_TYPE)kthread_delayed_work_timer_fn,\

				     (TIMER_DATA_TYPE)&(dwork.timer),	\

				     TIMER_IRQSAFE),			\

	}
@@ -167,7 +166,6 @@ extern void __kthread_init_worker(struct kthread_worker *worker, 
		kthread_init_work(&(dwork)->work, (fn));		\

		__setup_timer(&(dwork)->timer,				\

			      (TIMER_FUNC_TYPE)kthread_delayed_work_timer_fn,\

			      (TIMER_DATA_TYPE)&(dwork)->timer,		\

			      TIMER_IRQSAFE);				\

	} while (0)

include/linux/timer.h

+8 −10
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ struct timer_list { 
#define TIMER_DATA_TYPE		struct timer_list *

#define TIMER_FUNC_TYPE		void (*)(TIMER_DATA_TYPE)



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

#define __TIMER_INITIALIZER(_function, _flags) {		\

		.entry = { .next = TIMER_ENTRY_STATIC },	\

		.function = (_function),			\

		.flags = (_flags),				\
@@ -76,7 +76,7 @@ struct timer_list { 


#define DEFINE_TIMER(_name, _function)				\

	struct timer_list _name =				\

		__TIMER_INITIALIZER((TIMER_FUNC_TYPE)_function, 0, 0)

		__TIMER_INITIALIZER((TIMER_FUNC_TYPE)_function, 0)



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

		    const char *name, struct lock_class_key *key);
@@ -115,13 +115,13 @@ static inline void init_timer_on_stack_key(struct timer_list *timer, 
	init_timer_on_stack_key((_timer), (_flags), NULL, NULL)

#endif



#define __setup_timer(_timer, _fn, _data, _flags)			\

#define __setup_timer(_timer, _fn, _flags)				\

	do {								\

		__init_timer((_timer), (_flags));			\

		(_timer)->function = (_fn);				\

	} while (0)



#define __setup_timer_on_stack(_timer, _fn, _data, _flags)		\

#define __setup_timer_on_stack(_timer, _fn, _flags)			\

	do {								\

		__init_timer_on_stack((_timer), (_flags));		\

		(_timer)->function = (_fn);				\
@@ -132,16 +132,14 @@ static inline void timer_setup(struct timer_list *timer, 
			       void (*callback)(struct timer_list *),

			       unsigned int flags)

{

	__setup_timer(timer, (TIMER_FUNC_TYPE)callback,

		      (TIMER_DATA_TYPE)timer, flags);

	__setup_timer(timer, (TIMER_FUNC_TYPE)callback, flags);

}



static inline void timer_setup_on_stack(struct timer_list *timer,

			       void (*callback)(struct timer_list *),

			       unsigned int flags)

{

	__setup_timer_on_stack(timer, (TIMER_FUNC_TYPE)callback,

			       (TIMER_DATA_TYPE)timer, flags);

	__setup_timer_on_stack(timer, (TIMER_FUNC_TYPE)callback, flags);

}

#else

/*
@@ -151,11 +149,11 @@ static inline void timer_setup_on_stack(struct timer_list *timer, 
 */

# define timer_setup(timer, callback, flags)				\

		__setup_timer((timer), (TIMER_FUNC_TYPE)(callback),	\

			      (TIMER_DATA_TYPE)(timer), (flags))

			      (flags))

# define timer_setup_on_stack(timer, callback, flags)			\

		__setup_timer_on_stack((timer),				\

				       (TIMER_FUNC_TYPE)(callback),	\

				       (TIMER_DATA_TYPE)(timer), (flags))

				       (flags))

#endif



#define from_timer(var, callback_timer, timer_fieldname) \

include/linux/workqueue.h

+0 −3
Original line number Diff line number Diff line
@@ -177,7 +177,6 @@ struct execute_work { 
#define __DELAYED_WORK_INITIALIZER(n, f, tflags) {			\

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

	.timer = __TIMER_INITIALIZER((TIMER_FUNC_TYPE)delayed_work_timer_fn,\

				     (TIMER_DATA_TYPE)&(n.timer),	\

				     (tflags) | TIMER_IRQSAFE),		\

	}
@@ -244,7 +243,6 @@ static inline unsigned int work_static(struct work_struct *work) { return 0; } 
		INIT_WORK(&(_work)->work, (_func));			\

		__setup_timer(&(_work)->timer,				\

			      (TIMER_FUNC_TYPE)delayed_work_timer_fn,	\

			      (TIMER_DATA_TYPE)&(_work)->timer,		\

			      (_tflags) | TIMER_IRQSAFE);		\

	} while (0)
@@ -253,7 +251,6 @@ static inline unsigned int work_static(struct work_struct *work) { return 0; } 
		INIT_WORK_ONSTACK(&(_work)->work, (_func));		\

		__setup_timer_on_stack(&(_work)->timer,			\

				       (TIMER_FUNC_TYPE)delayed_work_timer_fn,\

				       (TIMER_DATA_TYPE)&(_work)->timer,\

				       (_tflags) | TIMER_IRQSAFE);	\

	} while (0)