summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstephen lu <lumotuwe@gmail.com>2017-10-23 23:43:53 +0200
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2017-10-24 01:31:53 +0200
commit82565a120544b2bdfaf602d9f5e7b9ab9a342ae8 (patch)
tree8dbb4ba0f2e5b51ab0ce0246643bb2a4ea2188be
parentInput: ff_memless - convert to using timer_setup() (diff)
downloadlinux-82565a120544b2bdfaf602d9f5e7b9ab9a342ae8.tar.xz
linux-82565a120544b2bdfaf602d9f5e7b9ab9a342ae8.zip
Input: gpio-keys - 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: Stephen Lu <lumotuwe@gmail.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-rw-r--r--drivers/input/keyboard/gpio_keys.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c
index e9f0ebf3267a..87e613dc33b8 100644
--- a/drivers/input/keyboard/gpio_keys.c
+++ b/drivers/input/keyboard/gpio_keys.c
@@ -419,9 +419,9 @@ static irqreturn_t gpio_keys_gpio_isr(int irq, void *dev_id)
return IRQ_HANDLED;
}
-static void gpio_keys_irq_timer(unsigned long _data)
+static void gpio_keys_irq_timer(struct timer_list *t)
{
- struct gpio_button_data *bdata = (struct gpio_button_data *)_data;
+ struct gpio_button_data *bdata = from_timer(bdata, t, release_timer);
struct input_dev *input = bdata->input;
unsigned long flags;
@@ -582,8 +582,7 @@ static int gpio_keys_setup_key(struct platform_device *pdev,
}
bdata->release_delay = button->debounce_interval;
- setup_timer(&bdata->release_timer,
- gpio_keys_irq_timer, (unsigned long)bdata);
+ timer_setup(&bdata->release_timer, gpio_keys_irq_timer, 0);
isr = gpio_keys_irq_isr;
irqflags = 0;