sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

input: gpio-keys: separate internal data from platform_data 

Do not abuse platform data for internal driver data, instead
use a separate struct for that.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Sascha Hauer 2014-02-14 09:18:33 +01:00
parent 7e66707c76
commit 59d6a0b7f1
2 changed files with 57 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
drivers/input/gpio_keys.c
View File

@ -12,31 +12,52 @@
#include <poller.h> #include <poller.h>
#include <gpio.h> #include <gpio.h>
static inline struct gpio_keys_platform_data * struct gpio_key {
int code;
int gpio;
int active_low;
int previous_state;
};
struct gpio_keys {
struct gpio_key *buttons;
int nbuttons;
/* optional */
int fifo_size;
struct kfifo *recv_fifo;
struct poller_struct poller;
struct console_device cdev;
};
static inline struct gpio_keys *
poller_to_gk_pdata(struct poller_struct *poller) poller_to_gk_pdata(struct poller_struct *poller)
{ {
return container_of(poller, struct gpio_keys_platform_data, poller); return container_of(poller, struct gpio_keys, poller);
} }
static inline struct gpio_keys_platform_data * static inline struct gpio_keys *
cdev_to_gk_pdata(struct console_device *cdev) cdev_to_gk_pdata(struct console_device *cdev)
{ {
return container_of(cdev, struct gpio_keys_platform_data, cdev); return container_of(cdev, struct gpio_keys, cdev);
} }
static void gpio_key_poller(struct poller_struct *poller) static void gpio_key_poller(struct poller_struct *poller)
{ {
struct gpio_keys_platform_data *pdata = poller_to_gk_pdata(poller); struct gpio_keys *gk = poller_to_gk_pdata(poller);
struct gpio_keys_button *gb; struct gpio_key *gb;
int i, val; int i, val;
for (i = 0; i < pdata->nbuttons; i++) { for (i = 0; i < gk->nbuttons; i++) {
gb = &pdata->buttons[i]; gb = &gk->buttons[i];
val = gpio_get_value(gb->gpio); val = gpio_get_value(gb->gpio);
if (val != gb->previous_state && val != gb->active_low) { if (val != gb->previous_state && val != gb->active_low) {
kfifo_put(pdata->recv_fifo, (u_char*)&gb->code, sizeof(int)); kfifo_put(gk->recv_fifo, (u_char*)&gb->code, sizeof(int));
debug("pressed gpio(%d) as %d\n", gb->gpio, gb->code); debug("pressed gpio(%d) as %d\n", gb->gpio, gb->code);
} }
gb->previous_state = val; gb->previous_state = val;
@ -45,17 +66,17 @@ static void gpio_key_poller(struct poller_struct *poller)
static int gpio_keys_tstc(struct console_device *cdev) static int gpio_keys_tstc(struct console_device *cdev)
{ {
struct gpio_keys_platform_data *pdata = cdev_to_gk_pdata(cdev); struct gpio_keys *gk = cdev_to_gk_pdata(cdev);
return (kfifo_len(pdata->recv_fifo) == 0) ? 0 : 1; return (kfifo_len(gk->recv_fifo) == 0) ? 0 : 1;
} }
static int gpio_keys_getc(struct console_device *cdev) static int gpio_keys_getc(struct console_device *cdev)
{ {
int code = 0; int code = 0;
struct gpio_keys_platform_data *pdata = cdev_to_gk_pdata(cdev); struct gpio_keys *gk = cdev_to_gk_pdata(cdev);
kfifo_get(pdata->recv_fifo, (u_char*)&code, sizeof(int)); kfifo_get(gk->recv_fifo, (u_char*)&code, sizeof(int));
return code; return code;
} }
@ -64,6 +85,7 @@ static int __init gpio_keys_probe(struct device_d *dev)
int ret, i, gpio; int ret, i, gpio;
struct gpio_keys_platform_data *pdata; struct gpio_keys_platform_data *pdata;
struct console_device *cdev; struct console_device *cdev;
struct gpio_keys *gk;
pdata = dev->platform_data; pdata = dev->platform_data;
@ -73,34 +95,46 @@ static int __init gpio_keys_probe(struct device_d *dev)
return -ENODEV; return -ENODEV;
} }
if (!pdata->fifo_size) gk = xzalloc(sizeof(*gk));
pdata->fifo_size = 50;
pdata->recv_fifo = kfifo_alloc(pdata->fifo_size); gk->fifo_size = 50;
if (pdata->fifo_size)
gk->fifo_size = pdata->fifo_size;
gk->recv_fifo = kfifo_alloc(pdata->fifo_size);
gk->buttons = xzalloc(pdata->nbuttons * sizeof(*gk->buttons));
gk->nbuttons = pdata->nbuttons;
for (i = 0; i < gk->nbuttons; i++) {
gk->buttons[i].gpio = pdata->buttons[i].gpio;
gk->buttons[i].code = pdata->buttons[i].code;
gk->buttons[i].active_low = pdata->buttons[i].active_low;
}
for (i = 0; i < pdata->nbuttons; i++) { for (i = 0; i < pdata->nbuttons; i++) {
gpio = pdata->buttons[i].gpio; gpio = gk->buttons[i].gpio;
ret = gpio_request(gpio, "gpio_keys"); ret = gpio_request(gpio, "gpio_keys");
if (ret) { if (ret) {
pr_err("gpio_keys: (%d) can not be requested\n", gpio); pr_err("gpio_keys: (%d) can not be requested\n", gpio);
return ret; return ret;
} }
gpio_direction_input(gpio); gpio_direction_input(gpio);
pdata->buttons[i].previous_state = gk->buttons[i].previous_state = gk->buttons[i].active_low;
pdata->buttons[i].active_low;
} }
pdata->poller.func = gpio_key_poller; gk->poller.func = gpio_key_poller;
cdev = &pdata->cdev; cdev = &gk->cdev;
dev->type_data = cdev; dev->type_data = cdev;
cdev->dev = dev; cdev->dev = dev;
cdev->tstc = gpio_keys_tstc; cdev->tstc = gpio_keys_tstc;
cdev->getc = gpio_keys_getc; cdev->getc = gpio_keys_getc;
console_register(&pdata->cdev); console_register(&gk->cdev);
return poller_register(&pdata->poller); return poller_register(&gk->poller);
} }
static struct driver_d gpio_keys_driver = { static struct driver_d gpio_keys_driver = {

7
include/gpio_keys.h
View File

@ -10,9 +10,6 @@ struct gpio_keys_button {
int gpio; int gpio;
int active_low; int active_low;
/* internal */
int previous_state;
}; };
struct gpio_keys_platform_data { struct gpio_keys_platform_data {
@ -21,10 +18,6 @@ struct gpio_keys_platform_data {
/* optional */ /* optional */
int fifo_size; int fifo_size;
struct kfifo *recv_fifo;
struct poller_struct poller;
struct console_device cdev;
}; };
#endif #endif