From 6e01437ec4a9f8250713f0daab532eb0e913b0f5 Mon Sep 17 00:00:00 2001 From: Tao Huang Date: Tue, 19 Feb 2019 15:46:04 +0800 Subject: [PATCH] fiq_debugger: setup_timer() -> timer_setup() Change-Id: Ia789a1e1d005cf311ab0a7a9e352ec9c9991e30b Signed-off-by: Tao Huang --- drivers/staging/android/fiq_debugger/fiq_debugger.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/staging/android/fiq_debugger/fiq_debugger.c b/drivers/staging/android/fiq_debugger/fiq_debugger.c index 1f527110e959..b046e2f5a511 100644 --- a/drivers/staging/android/fiq_debugger/fiq_debugger.c +++ b/drivers/staging/android/fiq_debugger/fiq_debugger.c @@ -668,9 +668,9 @@ static bool fiq_debugger_fiq_exec(struct fiq_debugger_state *state, return signal_helper; } -static void fiq_debugger_sleep_timer_expired(unsigned long data) +static void fiq_debugger_sleep_timer_expired(struct timer_list *t) { - struct fiq_debugger_state *state = (struct fiq_debugger_state *)data; + struct fiq_debugger_state *state = from_timer(state, t, sleep_timer); unsigned long flags; spin_lock_irqsave(&state->sleep_timer_lock, flags); @@ -1384,8 +1384,7 @@ static int fiq_debugger_probe(struct platform_device *pdev) state = kzalloc(sizeof(*state), GFP_KERNEL); state->output.printf = fiq_debugger_printf; - setup_timer(&state->sleep_timer, fiq_debugger_sleep_timer_expired, - (unsigned long)state); + timer_setup(&state->sleep_timer, fiq_debugger_sleep_timer_expired, 0); state->pdata = pdata; state->pdev = pdev; state->no_sleep = initial_no_sleep;