Commit 0b346838 authored by Alek Du's avatar Alek Du Committed by Dmitry Torokhov
Browse files

Input: gpio-keys - change timer to workqueue 



The gpio_get_value function of I2C/SPI GPIO expander may sleep thus this
function call can not be called in a timer function.

Signed-off-by: default avatarAlek Du <alek.du@intel.com>
Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent c57c0a2a

drivers/input/keyboard/gpio_keys.c

+12 −20
Original line number Original line Diff line number Diff line
@@ -22,13 +22,14 @@ 
#include <linux/platform_device.h>

#include <linux/platform_device.h>

#include <linux/input.h>

#include <linux/input.h>

#include <linux/gpio_keys.h>

#include <linux/gpio_keys.h>

#include <linux/workqueue.h>





#include <asm/gpio.h>

#include <asm/gpio.h>





struct gpio_button_data {

struct gpio_button_data {

	struct gpio_keys_button *button;

	struct gpio_keys_button *button;

	struct input_dev *input;

	struct input_dev *input;

	struct timer_list timer;

	struct delayed_work work;

};

};





struct gpio_keys_drvdata {

struct gpio_keys_drvdata {
@@ -36,8 +37,10 @@ struct gpio_keys_drvdata { 
	struct gpio_button_data data[0];

	struct gpio_button_data data[0];

};

};





static void gpio_keys_report_event(struct gpio_button_data *bdata)

static void gpio_keys_report_event(struct work_struct *work)

{

{

	struct gpio_button_data *bdata =

		container_of(work, struct gpio_button_data, work.work);

	struct gpio_keys_button *button = bdata->button;

	struct gpio_keys_button *button = bdata->button;

	struct input_dev *input = bdata->input;

	struct input_dev *input = bdata->input;

	unsigned int type = button->type ?: EV_KEY;

	unsigned int type = button->type ?: EV_KEY;
@@ -47,25 +50,17 @@ static void gpio_keys_report_event(struct gpio_button_data *bdata) 
	input_sync(input);

	input_sync(input);

}

}





static void gpio_check_button(unsigned long _data)

{

	struct gpio_button_data *data = (struct gpio_button_data *)_data;



	gpio_keys_report_event(data);

}



static irqreturn_t gpio_keys_isr(int irq, void *dev_id)

static irqreturn_t gpio_keys_isr(int irq, void *dev_id)

{

{

	struct gpio_button_data *bdata = dev_id;

	struct gpio_button_data *bdata = dev_id;

	struct gpio_keys_button *button = bdata->button;

	struct gpio_keys_button *button = bdata->button;

	unsigned long delay;





	BUG_ON(irq != gpio_to_irq(button->gpio));

	BUG_ON(irq != gpio_to_irq(button->gpio));





	if (button->debounce_interval)

	delay = button->debounce_interval ?

		mod_timer(&bdata->timer,

			msecs_to_jiffies(button->debounce_interval) : 0;

			jiffies + msecs_to_jiffies(button->debounce_interval));

	schedule_delayed_work(&bdata->work, delay);

	else

		gpio_keys_report_event(bdata);





	return IRQ_HANDLED;

	return IRQ_HANDLED;

}

}
@@ -112,8 +107,7 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev) 




		bdata->input = input;

		bdata->input = input;

		bdata->button = button;

		bdata->button = button;

		setup_timer(&bdata->timer,

		INIT_DELAYED_WORK(&bdata->work, gpio_keys_report_event);

			    gpio_check_button, (unsigned long)bdata);





		error = gpio_request(button->gpio, button->desc ?: "gpio_keys");

		error = gpio_request(button->gpio, button->desc ?: "gpio_keys");

		if (error < 0) {

		if (error < 0) {
@@ -172,8 +166,7 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev) 
 fail2:

 fail2:

	while (--i >= 0) {

	while (--i >= 0) {

		free_irq(gpio_to_irq(pdata->buttons[i].gpio), &ddata->data[i]);

		free_irq(gpio_to_irq(pdata->buttons[i].gpio), &ddata->data[i]);

		if (pdata->buttons[i].debounce_interval)

		cancel_delayed_work_sync(&ddata->data[i].work);

			del_timer_sync(&ddata->data[i].timer);

		gpio_free(pdata->buttons[i].gpio);

		gpio_free(pdata->buttons[i].gpio);

	}

	}
@@ -197,8 +190,7 @@ static int __devexit gpio_keys_remove(struct platform_device *pdev) 
	for (i = 0; i < pdata->nbuttons; i++) {

	for (i = 0; i < pdata->nbuttons; i++) {

		int irq = gpio_to_irq(pdata->buttons[i].gpio);

		int irq = gpio_to_irq(pdata->buttons[i].gpio);

		free_irq(irq, &ddata->data[i]);

		free_irq(irq, &ddata->data[i]);

		if (pdata->buttons[i].debounce_interval)

		cancel_delayed_work_sync(&ddata->data[i].work);

			del_timer_sync(&ddata->data[i].timer);

		gpio_free(pdata->buttons[i].gpio);

		gpio_free(pdata->buttons[i].gpio);

	}

	}