input: Change timer function to workqueue for gpio_keys driver
Subsystems (2)
PATCH 1/1 input: Change timer function to workqueue for gpio_keys driver
Quoted 1 line
From
35101ecc80cfc638ac80a2cea590ab86135be395Mon Sep 17 00:00:00 2001
From: Alek Du <[email protected]>
Date: Fri, 8 May 2009 12:25:34 +0800
Subject: [PATCH] input: Change timer function to workqueue for gpio_keys driver
The gpio_get_value function of I2C/SPI GPIO expander may sleep thus this function call can not be called in a timer function.
--- drivers/input/keyboard/gpio_keys.c | 32 ++++++++++++++------------------ 1 files changed, 14 insertions(+), 18 deletions(-)
drivers/input/keyboard/gpio_keys.c +14 -18
@@ -22,13 +22,17 @@#include <linux/platform_device.h> #include <linux/input.h> #include <linux/gpio_keys.h> +#include <linux/workqueue.h> #include <asm/gpio.h> struct gpio_button_data {struct gpio_keys_button *button;struct input_dev *input; -struct timer_list timer; +/* Change timer func to workqueue func due to the fact that gpio_get_value +* may sleep for some i2c and spi GPIO expander +*/ +struct delayed_work work; };struct gpio_keys_drvdata {
@@ -36,8 +40,10 @@ struct gpio_keys_drvdata {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 input_dev *input = bdata->input;unsigned int type = button->type ?:EV_KEY ;
@@ -47,13 +53,6 @@ static void gpio_keys_report_event(struct gpio_button_data *bdata)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) {struct gpio_button_data *bdata = dev_id;
@@ -62,10 +61,10 @@ static irqreturn_t gpio_keys_isr(int irq, void *dev_id)BUG_ON (irq !=gpio_to_irq (button->gpio));if (button->debounce_interval) -mod_timer (&bdata->timer, - jiffies +msecs_to_jiffies (button->debounce_interval)); +schedule_delayed_work (&bdata->work, +msecs_to_jiffies (button->debounce_interval));else -gpio_keys_report_event (bdata); +schedule_work (&bdata->work.work);return IRQ_HANDLED ; }
@@ -112,8 +111,7 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev) bdata->input = input; bdata->button = button; -setup_timer (&bdata->timer, - gpio_check_button, (unsigned long )bdata); +INIT_DELAYED_WORK (&bdata->work, gpio_keys_report_event); error =gpio_request (button->gpio, button->desc ?:"gpio_keys" );if (error <0 ) {
@@ -173,8 +171,7 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev) fail2:while (--i >=0 ) {free_irq (gpio_to_irq (pdata->buttons[i].gpio), &ddata->data[i]); -if (pdata->buttons[i].debounce_interval) -del_timer_sync (&ddata->data[i].timer); +cancel_delayed_work_sync (&ddata->data[i].work);gpio_free (pdata->buttons[i].gpio); }
@@ -198,8 +195,7 @@ static int __devexit gpio_keys_remove(struct platform_device *pdev)for (i =0 ; i < pdata->nbuttons; i++) {int irq =gpio_to_irq (pdata->buttons[i].gpio);free_irq (irq, &ddata->data[i]); -if (pdata->buttons[i].debounce_interval) -del_timer_sync (&ddata->data[i].timer); +cancel_delayed_work_sync (&ddata->data[i].work);gpio_free (pdata->buttons[i].gpio); }
Signature · 1 line
1.6.0.4
Hi Alek,
Adding linux-input ML, so not deleting any code.
Quoted 114 lines · Alek Du
From
35101ecc80cfc638ac80a2cea590ab86135be395Mon Sep 17 00:00:00 2001
From: Alek Du <[email protected]>
Date: Fri, 8 May 2009 12:25:34 +0800
Subject: [PATCH] input: Change timer function to workqueue forgpio_keysdriverThe
gpio_get_valuefunction of I2C/SPI GPIO expander may sleep thus this function call can not be called in a timer function.Signed-off-by Alek Du <[email protected]>---
drivers/input/keyboard/gpio_keys.c | 32 ++++++++++++++------------------1 files changed, 14 insertions(+), 18 deletions(-)drivers/input/keyboard/gpio_keys.c +10
-11@@ -22,13 +22,17 @@ #include <linux/platform_device.h> #include <linux/input.h> #include <linux/gpio_keys.h> +#include <linux/workqueue.h> #include <asm/gpio.h> struct gpio_button_data { struct gpio_keys_button *button; struct input_dev *input; - struct timer_list timer; +/* Change timer func to workqueue func due to the fact that gpio_get_value +* may sleep for some i2c and spi GPIO expander +*/ + struct delayed_work work; }; struct gpio_keys_drvdata {@@ -36,8 +40,10 @@ struct gpio_keys_drvdata { 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 input_dev *input = bdata->input; unsigned int type = button->type ?: EV_KEY;@@ -47,13 +53,6 @@ static void gpio_keys_report_event(struct gpio_button_data *bdata) 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) { struct gpio_button_data *bdata = dev_id;@@ -62,10 +61,10 @@ static irqreturn_t gpio_keys_isr(int irq, void *dev_id) BUG_ON(irq != gpio_to_irq(button->gpio)); if (button->debounce_interval) - mod_timer(&bdata->timer, - jiffies + msecs_to_jiffies(button->debounce_interval)); + schedule_delayed_work(&bdata->work, + msecs_to_jiffies(button->debounce_interval));else
-gpio_keys_report_event(bdata);
+schedule_work(&bdata->work.work);return
IRQ_HANDLED;
}drivers/input/keyboard/gpio_keys.c +1
-2@@ -112,8 +111,7 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev) bdata->input = input; bdata->button = button; - setup_timer(&bdata->timer, - gpio_check_button, (unsigned long)bdata); + INIT_DELAYED_WORK(&bdata->work, gpio_keys_report_event); error = gpio_request(button->gpio, button->desc ?: "gpio_keys"); if (error < 0) {@@ -173,8 +171,7 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev)fail2:
while (--i >= 0) {free_irq(gpio_to_irq(pdata->buttons[i].gpio), &ddata->data[i]);
- if (pdata->buttons[i].debounce_interval)
-del_timer_sync(&ddata->data[i].timer);
+cancel_delayed_work_sync(&ddata->data[i].work);gpio_free(pdata->buttons[i].gpio);
}drivers/input/keyboard/gpio_keys.c +1
-3@@ -198,8 +195,7 @@ static int __devexit gpio_keys_remove(struct platform_device *pdev) for (i = 0; i < pdata->nbuttons; i++) { int irq = gpio_to_irq(pdata->buttons[i].gpio); free_irq(irq, &ddata->data[i]); - if (pdata->buttons[i].debounce_interval) - del_timer_sync(&ddata->data[i].timer); + cancel_delayed_work_sync(&ddata->data[i].work); gpio_free(pdata->buttons[i].gpio); } --1.6.0.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Signature · 7 lines
---Trilok Soni http://triloksoni.wordpress.com http://www.linkedin.com/in/triloksoni -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html