Skip to content

Commit

Permalink
RAS/CEC: Convert timers to use timer_setup()
Browse files Browse the repository at this point in the history
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 <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: Christophe JAILLET <[email protected]>
Cc: Nicolas Iooss <[email protected]>
Cc: Ingo Molnar <[email protected]>
Signed-off-by: Kees Cook <[email protected]>
Reviewed-by: Borislav Petkov <[email protected]>
  • Loading branch information
kees committed Nov 1, 2017
1 parent f7c9564 commit 254db5b
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions drivers/ras/cec.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down Expand Up @@ -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");
Expand Down

0 comments on commit 254db5b

Please sign in to comment.