From f15bc9e72db7e47dee1be3a0bd3921d39fdc608c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= Date: Fri, 8 Aug 2008 12:14:36 -0400 Subject: [PATCH] --- yaml --- r: 115055 b: refs/heads/master c: ce25d7e90c7543f0046c3bdcdcc7594546c57dcc h: refs/heads/master i: 115053: 44a65ea843f7bcba6c40f93d7f893829a9632658 115051: f52cea4fe4965d96085c1b652ac1396775846c9c 115047: d938341235c391fa87d1917dd7556a1459144f27 115039: 147e0242ae5ff4d0bf2bfddd0a0f8692661e5c41 v: v3 --- [refs] | 2 +- trunk/drivers/input/keyboard/gpio_keys.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index ed516fe1a446..e411bcb97396 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 57ffe9d539e0eb741bb9ca8f2834d210e70ee2e3 +refs/heads/master: ce25d7e90c7543f0046c3bdcdcc7594546c57dcc diff --git a/trunk/drivers/input/keyboard/gpio_keys.c b/trunk/drivers/input/keyboard/gpio_keys.c index e2809d29d99d..fe22ca34d576 100644 --- a/trunk/drivers/input/keyboard/gpio_keys.c +++ b/trunk/drivers/input/keyboard/gpio_keys.c @@ -37,9 +37,10 @@ struct gpio_keys_drvdata { struct gpio_button_data data[0]; }; -static void gpio_keys_report_event(struct gpio_keys_button *button, - struct input_dev *input) +static void gpio_keys_report_event(struct gpio_button_data *bdata) { + 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(button->gpio) ? 1 : 0) ^ button->active_low; @@ -51,7 +52,7 @@ static void gpio_check_button(unsigned long _data) { struct gpio_button_data *data = (struct gpio_button_data *)_data; - gpio_keys_report_event(data->button, data->input); + gpio_keys_report_event(data); } static irqreturn_t gpio_keys_isr(int irq, void *dev_id) @@ -65,7 +66,7 @@ static irqreturn_t gpio_keys_isr(int irq, void *dev_id) mod_timer(&bdata->timer, jiffies + msecs_to_jiffies(button->debounce_interval)); else - gpio_keys_report_event(button, bdata->input); + gpio_keys_report_event(bdata); return IRQ_HANDLED; }