Input: touchsceen - 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. Signed-off-by: Kees Cook <keescook@chromium.org> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:

committed by
Dmitry Torokhov

parent
4ea40278eb
commit
ee03e3f005
@@ -146,9 +146,9 @@ static irqreturn_t w90p910_ts_interrupt(int irq, void *dev_id)
|
||||
return IRQ_HANDLED;
|
||||
}
|
||||
|
||||
static void w90p910_check_pen_up(unsigned long data)
|
||||
static void w90p910_check_pen_up(struct timer_list *t)
|
||||
{
|
||||
struct w90p910_ts *w90p910_ts = (struct w90p910_ts *) data;
|
||||
struct w90p910_ts *w90p910_ts = from_timer(w90p910_ts, t, timer);
|
||||
unsigned long flags;
|
||||
|
||||
spin_lock_irqsave(&w90p910_ts->lock, flags);
|
||||
@@ -232,8 +232,7 @@ static int w90x900ts_probe(struct platform_device *pdev)
|
||||
w90p910_ts->input = input_dev;
|
||||
w90p910_ts->state = TS_IDLE;
|
||||
spin_lock_init(&w90p910_ts->lock);
|
||||
setup_timer(&w90p910_ts->timer, w90p910_check_pen_up,
|
||||
(unsigned long)w90p910_ts);
|
||||
timer_setup(&w90p910_ts->timer, w90p910_check_pen_up, 0);
|
||||
|
||||
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||
if (!res) {
|
||||
|
Reference in New Issue
Block a user