Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 82565a12 authored by stephen lu's avatar stephen lu Committed by Dmitry Torokhov
Browse files

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: default avatarStephen Lu <lumotuwe@gmail.com>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 34445d4b

drivers/input/keyboard/gpio_keys.c

+3 −4
Original line number Diff line number Diff line
@@ -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;