Commit 8446b32b authored by stephen lu's avatar stephen lu Committed by Dmitry Torokhov

Input: ad7877 - convert to using 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: default avatarStephen Lu <lumotuwe@gmail.com>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 82565a12
...@@ -385,9 +385,9 @@ static inline void ad7877_ts_event_release(struct ad7877 *ts) ...@@ -385,9 +385,9 @@ static inline void ad7877_ts_event_release(struct ad7877 *ts)
input_sync(input_dev); input_sync(input_dev);
} }
static void ad7877_timer(unsigned long handle) static void ad7877_timer(struct timer_list *t)
{ {
struct ad7877 *ts = (void *)handle; struct ad7877 *ts = from_timer(ts, t, timer);
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&ts->lock, flags); spin_lock_irqsave(&ts->lock, flags);
...@@ -718,7 +718,7 @@ static int ad7877_probe(struct spi_device *spi) ...@@ -718,7 +718,7 @@ static int ad7877_probe(struct spi_device *spi)
ts->spi = spi; ts->spi = spi;
ts->input = input_dev; ts->input = input_dev;
setup_timer(&ts->timer, ad7877_timer, (unsigned long) ts); timer_setup(&ts->timer, ad7877_timer, 0);
mutex_init(&ts->mutex); mutex_init(&ts->mutex);
spin_lock_init(&ts->lock); spin_lock_init(&ts->lock);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment