p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
stephen lu 2017-10-23 14:43:53 -07:00 committed by Dmitry Torokhov
parent 34445d4b38
commit 82565a1205
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/input/keyboard/gpio_keys.c
View File

@ -419,9 +419,9 @@ static irqreturn_t gpio_keys_gpio_isr(int irq, void *dev_id)
return IRQ_HANDLED; 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; struct input_dev *input = bdata->input;
unsigned long flags; unsigned long flags;
@ -582,8 +582,7 @@ static int gpio_keys_setup_key(struct platform_device *pdev,
} }
bdata->release_delay = button->debounce_interval; bdata->release_delay = button->debounce_interval;
setup_timer(&bdata->release_timer, timer_setup(&bdata->release_timer, gpio_keys_irq_timer, 0);
gpio_keys_irq_timer, (unsigned long)bdata);
isr = gpio_keys_irq_isr; isr = gpio_keys_irq_isr;
irqflags = 0; irqflags = 0;