Messages in this thread Patch in this message | | | From | Rusty Russell <> | Subject | [PATCH 6/6] typesafe: TIMER_INITIALIZER and setup_timer | Date | Mon, 21 Apr 2008 09:10:10 +1000 |
| |
This patch lets timer callback functions have their natural type (ie. exactly match the data pointer type); it allows the old "unsigned long data" type as well.
Downside: if you use the old "unsigned long" callback type, you won't get a warning if your data is not an unsigned long, due to the cast.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> --- include/linux/timer.h | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-)
diff -r 1a72bd2d9ea6 include/linux/timer.h --- a/include/linux/timer.h Mon Apr 21 07:04:32 2008 +1000 +++ b/include/linux/timer.h Mon Apr 21 07:28:46 2008 +1000 @@ -24,11 +24,21 @@ struct timer_list { extern struct tvec_base boot_tvec_bases; -#define TIMER_INITIALIZER(_function, _expires, _data) { \ - .function = (_function), \ - .expires = (_expires), \ - .data = (_data), \ - .base = &boot_tvec_bases, \ +/* + * For historic reasons the timer function takes an unsigned long, so + * we use this variant of typesafe_cb. data is converted to an unsigned long + * if it is another integer type, by adding 0UL. + */ +#define typesafe_timerfn(fn, data) \ + __typesafe_cb(void (*)(unsigned long), (fn), \ + void (*)(const typeof((data)+0UL)), \ + void (*)(typeof((data)+0UL))) + +#define TIMER_INITIALIZER(_function, _expires, _data) { \ + .function = typesafe_timerfn((_function), (_data)), \ + .expires = (_expires), \ + .data = (unsigned long)(_data), \ + .base = &boot_tvec_bases, \ } #define DEFINE_TIMER(_name, _function, _expires, _data) \ @@ -38,9 +48,13 @@ void init_timer(struct timer_list *timer void init_timer(struct timer_list *timer); void init_timer_deferrable(struct timer_list *timer); -static inline void setup_timer(struct timer_list * timer, - void (*function)(unsigned long), - unsigned long data) +#define setup_timer(timer, function, data) \ + __setup_timer((timer), typesafe_timerfn((function), (data)), \ + (unsigned long)(data)) + +static inline void __setup_timer(struct timer_list * timer, + void (*function)(unsigned long), + unsigned long data) { timer->function = function; timer->data = data;
| |