Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

stephen lu and committed by
Dmitry Torokhov
82565a12 34445d4b

+3 -4
+3 -4
drivers/input/keyboard/gpio_keys.c
··· 419 419 return IRQ_HANDLED; 420 420 } 421 421 422 - static void gpio_keys_irq_timer(unsigned long _data) 422 + static void gpio_keys_irq_timer(struct timer_list *t) 423 423 { 424 - struct gpio_button_data *bdata = (struct gpio_button_data *)_data; 424 + struct gpio_button_data *bdata = from_timer(bdata, t, release_timer); 425 425 struct input_dev *input = bdata->input; 426 426 unsigned long flags; 427 427 ··· 582 582 } 583 583 584 584 bdata->release_delay = button->debounce_interval; 585 - setup_timer(&bdata->release_timer, 586 - gpio_keys_irq_timer, (unsigned long)bdata); 585 + timer_setup(&bdata->release_timer, gpio_keys_irq_timer, 0); 587 586 588 587 isr = gpio_keys_irq_isr; 589 588 irqflags = 0;