summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorstephen lu <lumotuwe@gmail.com>2017-10-24 00:51:37 +0300
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2017-10-24 02:31:56 +0300
commit8446b32b0675b432451bdb35bd193597477f1bfa (patch)
tree56597797782dae022486b9b07691d22970bb4a3b
parent82565a120544b2bdfaf602d9f5e7b9ab9a342ae8 (diff)
downloadlinux-8446b32b0675b432451bdb35bd193597477f1bfa.tar.xz
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: Stephen Lu <lumotuwe@gmail.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-rw-r--r--drivers/input/touchscreen/ad7877.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/input/touchscreen/ad7877.c b/drivers/input/touchscreen/ad7877.c
index 9c250ae780d9..0381c7809d1b 100644
--- a/drivers/input/touchscreen/ad7877.c
+++ b/drivers/input/touchscreen/ad7877.c
@@ -385,9 +385,9 @@ static inline void ad7877_ts_event_release(struct ad7877 *ts)
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;
spin_lock_irqsave(&ts->lock, flags);
@@ -718,7 +718,7 @@ static int ad7877_probe(struct spi_device *spi)
ts->spi = spi;
ts->input = input_dev;
- setup_timer(&ts->timer, ad7877_timer, (unsigned long) ts);
+ timer_setup(&ts->timer, ad7877_timer, 0);
mutex_init(&ts->mutex);
spin_lock_init(&ts->lock);