diff options
| author | Kees Cook <keescook@chromium.org> | 2017-08-28 20:28:21 +0200 |
|---|---|---|
| committer | Kees Cook <keescook@chromium.org> | 2017-11-22 00:57:05 +0100 |
| commit | 24ed960abf1d50cb7834e99a0cfc081bc0656712 (patch) | |
| tree | 9eff9c73720604a2be0358083fb8c3c20a08a499 /security/keys | |
| parent | s390: cmm: Convert timers to use timer_setup() (diff) | |
| download | linux-24ed960abf1d50cb7834e99a0cfc081bc0656712.tar.xz linux-24ed960abf1d50cb7834e99a0cfc081bc0656712.zip | |
treewide: Switch DEFINE_TIMER callbacks to struct timer_list *
This changes all DEFINE_TIMER() callbacks to use a struct timer_list
pointer instead of unsigned long. Since the data argument has already been
removed, none of these callbacks are using their argument currently, so
this renames the argument to "unused".
Done using the following semantic patch:
@match_define_timer@
declarer name DEFINE_TIMER;
identifier _timer, _callback;
@@
DEFINE_TIMER(_timer, _callback);
@change_callback depends on match_define_timer@
identifier match_define_timer._callback;
type _origtype;
identifier _origarg;
@@
void
-_callback(_origtype _origarg)
+_callback(struct timer_list *unused)
{ ... }
Signed-off-by: Kees Cook <keescook@chromium.org>
Diffstat (limited to 'security/keys')
| -rw-r--r-- | security/keys/gc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/security/keys/gc.c b/security/keys/gc.c index afb3a9175d76..b93603724b8c 100644 --- a/security/keys/gc.c +++ b/security/keys/gc.c @@ -29,7 +29,7 @@ DECLARE_WORK(key_gc_work, key_garbage_collector); /* * Reaper for links from keyrings to dead keys. */ -static void key_gc_timer_func(unsigned long); +static void key_gc_timer_func(struct timer_list *); static DEFINE_TIMER(key_gc_timer, key_gc_timer_func); static time_t key_gc_next_run = LONG_MAX; @@ -84,7 +84,7 @@ void key_schedule_gc_links(void) * Some key's cleanup time was met after it expired, so we need to get the * reaper to go through a cycle finding expired keys. */ -static void key_gc_timer_func(unsigned long data) +static void key_gc_timer_func(struct timer_list *unused) { kenter(""); key_gc_next_run = LONG_MAX; |