diff options
| author | Kees Cook <keescook@chromium.org> | 2017-10-21 08:37:11 -0700 |
|---|---|---|
| committer | Kees Cook <keescook@chromium.org> | 2017-11-01 11:44:51 -0700 |
| commit | 254db5bd075427b0f71ea112b30c924fb22bd0fd (patch) | |
| tree | ccc3917bbdf99c352d1c69c1a8f903ace5e7c7f7 /drivers/ras | |
| parent | f7c9564a7cfa3ff69be74bcb1867c898772748b6 (diff) | |
| download | linux-rpi-254db5bd075427b0f71ea112b30c924fb22bd0fd.tar.gz linux-rpi-254db5bd075427b0f71ea112b30c924fb22bd0fd.tar.bz2 linux-rpi-254db5bd075427b0f71ea112b30c924fb22bd0fd.zip | |
RAS/CEC: Convert timers to use timer_setup()
In preparation for unconditionally passing the struct timer_list pointer to
all timer callbacks, switch to using the new timer_setup() and from_timer()
to pass the timer pointer explicitly.
Cc: Borislav Petkov <bp@suse.de>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Cc: Nicolas Iooss <nicolas.iooss_linux@m4x.org>
Cc: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Borislav Petkov <bp@suse.de>
Diffstat (limited to 'drivers/ras')
| -rw-r--r-- | drivers/ras/cec.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/ras/cec.c b/drivers/ras/cec.c index d0e5d6ee882c..4c586d731c48 100644 --- a/drivers/ras/cec.c +++ b/drivers/ras/cec.c @@ -168,11 +168,9 @@ static void cec_mod_timer(struct timer_list *t, unsigned long interval) mod_timer(t, round_jiffies(iv)); } -static void cec_timer_fn(unsigned long data) +static void cec_timer_fn(struct timer_list *unused) { - struct ce_array *ca = (struct ce_array *)data; - - do_spring_cleaning(ca); + do_spring_cleaning(&ce_arr); cec_mod_timer(&cec_timer, timer_interval); } @@ -509,7 +507,7 @@ void __init cec_init(void) if (create_debugfs_nodes()) return; - setup_timer(&cec_timer, cec_timer_fn, (unsigned long)&ce_arr); + timer_setup(&cec_timer, cec_timer_fn, 0); cec_mod_timer(&cec_timer, CEC_TIMER_DEFAULT_INTERVAL); pr_info("Correctable Errors collector initialized.\n"); |