* [patch 0/3] gpio_keys driver updates
@ 2009-11-10 22:59 Ben Dooks
2009-11-10 22:59 ` [patch 1/3] gpio_keys: use dev_ macros to report information Ben Dooks
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Ben Dooks @ 2009-11-10 22:59 UTC (permalink / raw)
To: linux-input
Some updates for the gpio_keys drivers.
^ permalink raw reply [flat|nested] 5+ messages in thread
* [patch 1/3] gpio_keys: use dev_ macros to report information
2009-11-10 22:59 [patch 0/3] gpio_keys driver updates Ben Dooks
@ 2009-11-10 22:59 ` Ben Dooks
2009-11-10 22:59 ` [patch 2/3] gpio_keys: use <linux/gpio.h> instead of <asm/gpio.h> Ben Dooks
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Ben Dooks @ 2009-11-10 22:59 UTC (permalink / raw)
To: linux-input; +Cc: Simtec Linux Team
[-- Attachment #1: simtec/ready/gpio-buttons-used-dev-reporting.patch --]
[-- Type: text/plain, Size: 2703 bytes --]
The gpio_keys driver is binding to a platform device but using pr_err()
to report errors. Change to using dev_err() so that all messages are
prefixed by the device name.
Signed-off-by: Ben Dooks <ben@simtec.co.uk>
Signed-off-by: Simtec Linux Team <linux@simtec.co.uk>
---
drivers/input/keyboard/gpio_keys.c | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
Index: b/drivers/input/keyboard/gpio_keys.c
===================================================================
--- a/drivers/input/keyboard/gpio_keys.c 2009-11-03 22:17:12.000000000 +0000
+++ b/drivers/input/keyboard/gpio_keys.c 2009-11-03 22:22:45.000000000 +0000
@@ -78,6 +78,7 @@ static int __devinit gpio_keys_probe(str
{
struct gpio_keys_platform_data *pdata = pdev->dev.platform_data;
struct gpio_keys_drvdata *ddata;
+ struct device *dev = &pdev->dev;
struct input_dev *input;
int i, error;
int wakeup = 0;
@@ -87,6 +88,7 @@ static int __devinit gpio_keys_probe(str
GFP_KERNEL);
input = input_allocate_device();
if (!ddata || !input) {
+ dev_err(dev, "failed to allocate state\n");
error = -ENOMEM;
goto fail1;
}
@@ -122,14 +124,14 @@ static int __devinit gpio_keys_probe(str
error = gpio_request(button->gpio, button->desc ?: "gpio_keys");
if (error < 0) {
- pr_err("gpio-keys: failed to request GPIO %d,"
- " error %d\n", button->gpio, error);
+ dev_err(dev, "failed to request GPIO %d, error %d\n",
+ button->gpio, error);
goto fail2;
}
error = gpio_direction_input(button->gpio);
if (error < 0) {
- pr_err("gpio-keys: failed to configure input"
+ dev_err(dev, "failed to configure"
" direction for GPIO %d, error %d\n",
button->gpio, error);
gpio_free(button->gpio);
@@ -139,8 +141,8 @@ static int __devinit gpio_keys_probe(str
irq = gpio_to_irq(button->gpio);
if (irq < 0) {
error = irq;
- pr_err("gpio-keys: Unable to get irq number"
- " for GPIO %d, error %d\n",
+ dev_err(dev, "Unable to get irq number "
+ "for GPIO %d, error %d\n",
button->gpio, error);
gpio_free(button->gpio);
goto fail2;
@@ -152,7 +154,7 @@ static int __devinit gpio_keys_probe(str
button->desc ? button->desc : "gpio_keys",
bdata);
if (error) {
- pr_err("gpio-keys: Unable to claim irq %d; error %d\n",
+ dev_err(dev, "Unable to claim irq %d; error %d\n",
irq, error);
gpio_free(button->gpio);
goto fail2;
@@ -166,7 +168,7 @@ static int __devinit gpio_keys_probe(str
error = input_register_device(input);
if (error) {
- pr_err("gpio-keys: Unable to register input device, "
+ dev_err(dev, "Unable to register input device, "
"error: %d\n", error);
goto fail2;
}
^ permalink raw reply [flat|nested] 5+ messages in thread
* [patch 2/3] gpio_keys: use <linux/gpio.h> instead of <asm/gpio.h>
2009-11-10 22:59 [patch 0/3] gpio_keys driver updates Ben Dooks
2009-11-10 22:59 ` [patch 1/3] gpio_keys: use dev_ macros to report information Ben Dooks
@ 2009-11-10 22:59 ` Ben Dooks
2009-11-10 22:59 ` [patch 3/3] gpio_keys: seperate individual button setup to make code neater Ben Dooks
2009-11-11 5:08 ` [patch 0/3] gpio_keys driver updates Dmitry Torokhov
3 siblings, 0 replies; 5+ messages in thread
From: Ben Dooks @ 2009-11-10 22:59 UTC (permalink / raw)
To: linux-input; +Cc: Simtec Linux Team
[-- Attachment #1: simtec/ready/gpio-buttons-fix-include.patch --]
[-- Type: text/plain, Size: 761 bytes --]
The gpio keys driver should be using <linux/gpio.h> instead of <asm/gpio.h>
Signed-off-by: Ben Dooks <ben@simtec.co.uk>
Signed-off-by: Simtec Linux Team <linux@simtec.co.uk>
---
drivers/input/keyboard/gpio_keys.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
Index: b/drivers/input/keyboard/gpio_keys.c
===================================================================
--- a/drivers/input/keyboard/gpio_keys.c 2009-11-02 21:45:30.000000000 +0000
+++ b/drivers/input/keyboard/gpio_keys.c 2009-11-02 22:03:01.000000000 +0000
@@ -23,8 +23,7 @@
#include <linux/input.h>
#include <linux/gpio_keys.h>
#include <linux/workqueue.h>
-
-#include <asm/gpio.h>
+#include <linux/gpio.h>
struct gpio_button_data {
struct gpio_keys_button *button;
^ permalink raw reply [flat|nested] 5+ messages in thread
* [patch 3/3] gpio_keys: seperate individual button setup to make code neater
2009-11-10 22:59 [patch 0/3] gpio_keys driver updates Ben Dooks
2009-11-10 22:59 ` [patch 1/3] gpio_keys: use dev_ macros to report information Ben Dooks
2009-11-10 22:59 ` [patch 2/3] gpio_keys: use <linux/gpio.h> instead of <asm/gpio.h> Ben Dooks
@ 2009-11-10 22:59 ` Ben Dooks
2009-11-11 5:08 ` [patch 0/3] gpio_keys driver updates Dmitry Torokhov
3 siblings, 0 replies; 5+ messages in thread
From: Ben Dooks @ 2009-11-10 22:59 UTC (permalink / raw)
To: linux-input; +Cc: Simtec Linux Team
[-- Attachment #1: simtec/ready/gpio-buttons-make-probe-neater.patch --]
[-- Type: text/plain, Size: 3656 bytes --]
Move the code that deals with setting up each individual button out into
a new function to reduce the indentation and allow us to common up some
of the error recovery code.
Signed-off-by: Ben Dooks <ben@simtec.co.uk>
Signed-off-by: Simtec Linux Team <linux@simtec.co.uk>
---
drivers/input/keyboard/gpio_keys.c | 93 +++++++++++++++++++++----------------
1 file changed, 53 insertions(+), 40 deletions(-)
Index: b/drivers/input/keyboard/gpio_keys.c
===================================================================
--- a/drivers/input/keyboard/gpio_keys.c 2009-11-09 16:48:27.000000000 +0000
+++ b/drivers/input/keyboard/gpio_keys.c 2009-11-09 16:49:06.000000000 +0000
@@ -73,6 +73,57 @@ static irqreturn_t gpio_keys_isr(int irq
return IRQ_HANDLED;
}
+static int __devinit gpio_keys_setup_key(struct device *dev,
+ struct gpio_button_data *bdata,
+ struct gpio_keys_button *button)
+{
+ char *desc = button->desc ? button->desc : "gpio_keys";
+ int irq, error;
+
+ setup_timer(&bdata->timer, gpio_keys_timer, (unsigned long)bdata);
+ INIT_WORK(&bdata->work, gpio_keys_report_event);
+
+ error = gpio_request(button->gpio, desc);
+ if (error < 0) {
+ dev_err(dev, "failed to request GPIO %d, error %d\n",
+ button->gpio, error);
+ goto fail2;
+ }
+
+ error = gpio_direction_input(button->gpio);
+ if (error < 0) {
+ dev_err(dev, "failed to configure"
+ " direction for GPIO %d, error %d\n",
+ button->gpio, error);
+ goto fail3;
+ }
+
+ irq = gpio_to_irq(button->gpio);
+ if (irq < 0) {
+ error = irq;
+ dev_err(dev, "Unable to get irq number for GPIO %d, error %d\n",
+ button->gpio, error);
+ goto fail3;
+ }
+
+ error = request_irq(irq, gpio_keys_isr,
+ IRQF_SHARED |
+ IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
+ desc, bdata);
+ if (error) {
+ dev_err(dev, "Unable to claim irq %d; error %d\n",
+ irq, error);
+ goto fail3;
+ }
+
+ return 0;
+
+fail3:
+ gpio_free(button->gpio);
+fail2:
+ return error;
+}
+
static int __devinit gpio_keys_probe(struct platform_device *pdev)
{
struct gpio_keys_platform_data *pdata = pdev->dev.platform_data;
@@ -112,52 +163,14 @@ static int __devinit gpio_keys_probe(str
for (i = 0; i < pdata->nbuttons; i++) {
struct gpio_keys_button *button = &pdata->buttons[i];
struct gpio_button_data *bdata = &ddata->data[i];
- int irq;
unsigned int type = button->type ?: EV_KEY;
bdata->input = input;
bdata->button = button;
- setup_timer(&bdata->timer,
- gpio_keys_timer, (unsigned long)bdata);
- INIT_WORK(&bdata->work, gpio_keys_report_event);
-
- error = gpio_request(button->gpio, button->desc ?: "gpio_keys");
- if (error < 0) {
- dev_err(dev, "failed to request GPIO %d, error %d\n",
- button->gpio, error);
- goto fail2;
- }
-
- error = gpio_direction_input(button->gpio);
- if (error < 0) {
- dev_err(dev, "failed to configure"
- " direction for GPIO %d, error %d\n",
- button->gpio, error);
- gpio_free(button->gpio);
- goto fail2;
- }
- irq = gpio_to_irq(button->gpio);
- if (irq < 0) {
- error = irq;
- dev_err(dev, "Unable to get irq number "
- "for GPIO %d, error %d\n",
- button->gpio, error);
- gpio_free(button->gpio);
+ error = gpio_keys_setup_key(dev, bdata, button);
+ if (error)
goto fail2;
- }
-
- error = request_irq(irq, gpio_keys_isr,
- IRQF_SHARED |
- IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
- button->desc ? button->desc : "gpio_keys",
- bdata);
- if (error) {
- dev_err(dev, "Unable to claim irq %d; error %d\n",
- irq, error);
- gpio_free(button->gpio);
- goto fail2;
- }
if (button->wakeup)
wakeup = 1;
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [patch 0/3] gpio_keys driver updates
2009-11-10 22:59 [patch 0/3] gpio_keys driver updates Ben Dooks
` (2 preceding siblings ...)
2009-11-10 22:59 ` [patch 3/3] gpio_keys: seperate individual button setup to make code neater Ben Dooks
@ 2009-11-11 5:08 ` Dmitry Torokhov
3 siblings, 0 replies; 5+ messages in thread
From: Dmitry Torokhov @ 2009-11-11 5:08 UTC (permalink / raw)
To: Ben Dooks; +Cc: linux-input
On Tue, Nov 10, 2009 at 10:59:37PM +0000, Ben Dooks wrote:
> Some updates for the gpio_keys drivers.
Applied all three to 'next', thank you Ben.
--
Dmitry
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2009-11-11 5:08 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-11-10 22:59 [patch 0/3] gpio_keys driver updates Ben Dooks
2009-11-10 22:59 ` [patch 1/3] gpio_keys: use dev_ macros to report information Ben Dooks
2009-11-10 22:59 ` [patch 2/3] gpio_keys: use <linux/gpio.h> instead of <asm/gpio.h> Ben Dooks
2009-11-10 22:59 ` [patch 3/3] gpio_keys: seperate individual button setup to make code neater Ben Dooks
2009-11-11 5:08 ` [patch 0/3] gpio_keys driver updates Dmitry Torokhov
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.