diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-03-18 23:36:29 -0700 |
---|---|---|
committer | Simone Willett <swillett@nvidia.com> | 2012-03-26 17:50:45 -0700 |
commit | 3b06fba5f05ec60a47bc7387e2419c486779450a (patch) | |
tree | 0c69ac23964e9607efa4bd658d1ff86a4c4bfc9c | |
parent | db3abc205f15428ef40aa716709eb70ab6cb14d7 (diff) |
Input: gpio_keys - constify platform data
The platform data should not be altered and therefore should be
accessed through const pointers.
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Cherry-picked from
d9080921aa32c70a95476ce387e973787b892591
Change-Id: I5791f831909d4417a5c2732e310630c97c42f4a9
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Reviewed-on: http://git-master/r/92318
Reviewed-by: Automatic_Commit_Validation_User
-rw-r--r-- | drivers/input/keyboard/gpio_keys.c | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c index 09fdad1e6171..9e4a77ce6bf8 100644 --- a/drivers/input/keyboard/gpio_keys.c +++ b/drivers/input/keyboard/gpio_keys.c @@ -32,7 +32,7 @@ #include <linux/of_gpio.h> struct gpio_button_data { - struct gpio_keys_button *button; + const struct gpio_keys_button *button; struct input_dev *input; struct timer_list timer; struct work_struct work; @@ -324,7 +324,7 @@ static struct attribute_group gpio_keys_attr_group = { static void gpio_keys_report_event(struct gpio_button_data *bdata) { - struct gpio_keys_button *button = bdata->button; + const struct gpio_keys_button *button = bdata->button; struct input_dev *input = bdata->input; unsigned int type = button->type ?: EV_KEY; int state = (gpio_get_value_cansleep(button->gpio) ? 1 : 0) ^ button->active_low; @@ -356,7 +356,7 @@ static void gpio_keys_timer(unsigned long _data) static irqreturn_t gpio_keys_isr(int irq, void *dev_id) { struct gpio_button_data *bdata = dev_id; - struct gpio_keys_button *button = bdata->button; + const struct gpio_keys_button *button = bdata->button; BUG_ON(irq != gpio_to_irq(button->gpio)); @@ -370,8 +370,9 @@ static irqreturn_t gpio_keys_isr(int irq, void *dev_id) } static int __devinit gpio_keys_setup_key(struct platform_device *pdev, + struct input_dev *input, struct gpio_button_data *bdata, - struct gpio_keys_button *button) + const struct gpio_keys_button *button) { const char *desc = button->desc ? button->desc : "gpio_keys"; struct device *dev = &pdev->dev; @@ -380,6 +381,8 @@ static int __devinit gpio_keys_setup_key(struct platform_device *pdev, setup_timer(&bdata->timer, gpio_keys_timer, (unsigned long)bdata); INIT_WORK(&bdata->work, gpio_keys_work_func); + bdata->input = input; + bdata->button = button; error = gpio_request(button->gpio, desc); if (error < 0) { @@ -427,6 +430,7 @@ static int __devinit gpio_keys_setup_key(struct platform_device *pdev, goto fail3; } + input_set_capability(input, button->type ?: EV_KEY, button->code); return 0; fail3: @@ -551,7 +555,7 @@ static int gpio_keys_get_devtree_pdata(struct device *dev, static int __devinit gpio_keys_probe(struct platform_device *pdev) { - struct gpio_keys_platform_data *pdata = pdev->dev.platform_data; + const struct gpio_keys_platform_data *pdata = pdev->dev.platform_data; struct gpio_keys_drvdata *ddata; struct device *dev = &pdev->dev; struct gpio_keys_platform_data alt_pdata; @@ -601,21 +605,15 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev) __set_bit(EV_REP, input->evbit); for (i = 0; i < pdata->nbuttons; i++) { - struct gpio_keys_button *button = &pdata->buttons[i]; + const struct gpio_keys_button *button = &pdata->buttons[i]; struct gpio_button_data *bdata = &ddata->data[i]; - unsigned int type = button->type ?: EV_KEY; - - bdata->input = input; - bdata->button = button; - error = gpio_keys_setup_key(pdev, bdata, button); + error = gpio_keys_setup_key(pdev, input, bdata, button); if (error) goto fail2; if (button->wakeup) wakeup = 1; - - input_set_capability(input, type, button->code); } error = sysfs_create_group(&pdev->dev.kobj, &gpio_keys_attr_group); @@ -701,11 +699,12 @@ static int __devexit gpio_keys_remove(struct platform_device *pdev) static int gpio_keys_suspend(struct device *dev) { struct gpio_keys_drvdata *ddata = dev_get_drvdata(dev); + const struct gpio_keys_button *button; int i; if (device_may_wakeup(dev)) { for (i = 0; i < ddata->n_buttons; i++) { - struct gpio_keys_button *button = ddata->data[i].button; + button = ddata->data[i].button; if (button->wakeup) { int irq = gpio_to_irq(button->gpio); enable_irq_wake(irq); @@ -722,14 +721,14 @@ static int gpio_keys_resume(struct device *dev) struct gpio_keys_drvdata *ddata = dev_get_drvdata(dev); struct gpio_keys_platform_data *pdata = pdev->dev.platform_data; int wakeup_key = KEY_RESERVED; + const struct gpio_keys_button *button; int i; if (pdata && pdata->wakeup_key) wakeup_key = pdata->wakeup_key(); for (i = 0; i < ddata->n_buttons; i++) { - - struct gpio_keys_button *button = ddata->data[i].button; + button = ddata->data[i].button; if (button->wakeup && device_may_wakeup(dev)) { int irq = gpio_to_irq(button->gpio); disable_irq_wake(irq); |