commit 6afaf6488a62efd6ad15269f2bf4482aef55823f
author Amit Pundir <amit.pundir@linaro.org> Tue Jan 09 20:14:43 2018 +0530
committer Amit Pundir <amit.pundir@linaro.org> Mon Feb 12 20:38:58 2018 +0530
tree c0fb262553ea7e153bc7f8fab804c9c36eb9b6dc
parent 14d3aa2b7571201168bb686a09f3ef5799fc232e

RFC: ANDROID: fiq_debugger: setup_timer is obsolete use timer_setup instead

Upstream commit 919b250f8570 (timer: Remove redundant __setup_timer*() macros)
made  setup_timer() macro obsolete, so use timer_setup() instead.

Followed setup_timer() -> timer_setup() conversion as done in upstream
commit e99e88a9d2b0 ("treewide: setup_timer() -> timer_setup()")

Signed-off-by: Amit Pundir <amit.pundir@linaro.org>

drivers/staging/android/fiq_debugger/fiq_debugger.c

diff --git a/drivers/staging/android/fiq_debugger/fiq_debugger.c b/drivers/staging/android/fiq_debugger/fiq_debugger.c
index a213f4d..4214bcc 100644
--- a/drivers/staging/android/fiq_debugger/fiq_debugger.c
+++ b/drivers/staging/android/fiq_debugger/fiq_debugger.c
@@ -545,9 +545,9 @@
 	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);
@@ -1061,8 +1061,7 @@
 
 	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;