openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Input: gpio-keys - avoid possibility of sleeping in timer function 

The gpio_get_value function may sleep, so it should not be called in a
timer function. Move gpio_get_value calls to workqueue.

Signed-off-by: Jani Nikula <ext-jani.1.nikula@nokia.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
This commit is contained in:
Jani Nikula 2009-06-28 22:38:56 -07:00 committed by Dmitry Torokhov
parent ca865a77b5
commit da0d03fe6c
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,6 +22,7 @@
#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>
@ -29,6 +30,7 @@ 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 timer_list timer;
struct work_struct work;
}; };
struct gpio_keys_drvdata { struct gpio_keys_drvdata {
@ -36,8 +38,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);
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,11 +51,11 @@ 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) static void gpio_keys_timer(unsigned long _data)
{ {
struct gpio_button_data *data = (struct gpio_button_data *)_data; struct gpio_button_data *data = (struct gpio_button_data *)_data;
gpio_keys_report_event(data); schedule_work(&data->work);
} }
static irqreturn_t gpio_keys_isr(int irq, void *dev_id) static irqreturn_t gpio_keys_isr(int irq, void *dev_id)
@ -65,7 +69,7 @@ static irqreturn_t gpio_keys_isr(int irq, void *dev_id)
mod_timer(&bdata->timer, mod_timer(&bdata->timer,
jiffies + msecs_to_jiffies(button->debounce_interval)); jiffies + msecs_to_jiffies(button->debounce_interval));
else else
gpio_keys_report_event(bdata); schedule_work(&bdata->work);
return IRQ_HANDLED; return IRQ_HANDLED;
} }
@ -113,7 +117,8 @@ 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, setup_timer(&bdata->timer,
gpio_check_button, (unsigned long)bdata); gpio_keys_timer, (unsigned long)bdata);
INIT_WORK(&bdata->work, gpio_keys_report_event);
error = gpio_request(button->gpio, button->desc ?: "gpio_keys"); error = gpio_request(button->gpio, button->desc ?: "gpio_keys");
if (error < 0) { if (error < 0) {
@ -174,6 +179,7 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev)
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) if (pdata->buttons[i].debounce_interval)
del_timer_sync(&ddata->data[i].timer); del_timer_sync(&ddata->data[i].timer);
cancel_work_sync(&ddata->data[i].work);
gpio_free(pdata->buttons[i].gpio); gpio_free(pdata->buttons[i].gpio);
} }
@ -199,6 +205,7 @@ static int __devexit gpio_keys_remove(struct platform_device *pdev)
free_irq(irq, &ddata->data[i]); free_irq(irq, &ddata->data[i]);
if (pdata->buttons[i].debounce_interval) if (pdata->buttons[i].debounce_interval)
del_timer_sync(&ddata->data[i].timer); del_timer_sync(&ddata->data[i].timer);
cancel_work_sync(&ddata->data[i].work);
gpio_free(pdata->buttons[i].gpio); gpio_free(pdata->buttons[i].gpio);
} }