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>

diff --git a/drivers/ras/cec.c b/drivers/ras/cec.c
index d0e5d6ee882c4e041d8c3db4e41392d9bc6d90ab..4c586d731c48fb95e7106f95d63215f26899cf18 100644 (file)
--- 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");