1 files changed, 12 insertions, 23 deletions

diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c
index be58730e636a..e2809d29d99d 100644
--- a/drivers/input/keyboard/gpio_keys.c
+++ b/drivers/input/keyboard/gpio_keys.c
@@ -56,29 +56,18 @@ static void gpio_check_button(unsigned long _data)
 
 static irqreturn_t gpio_keys_isr(int irq, void *dev_id)
 {
-        struct platform_device *pdev = dev_id;
-        struct gpio_keys_platform_data *pdata = pdev->dev.platform_data;
-        struct gpio_keys_drvdata *ddata = platform_get_drvdata(pdev);
-        int i;
+        struct gpio_button_data *bdata = dev_id;
+        struct gpio_keys_button *button = bdata->button;
 
-        for (i = 0; i < pdata->nbuttons; i++) {
-                struct gpio_keys_button *button = &pdata->buttons[i];
+        BUG_ON(irq != gpio_to_irq(button->gpio));
 
-                if (irq == gpio_to_irq(button->gpio)) {
-                        struct gpio_button_data *bdata = &ddata->data[i];
-
-                        if (button->debounce_interval)
-                                mod_timer(&bdata->timer,
-                                          jiffies +
-                                          msecs_to_jiffies(button->debounce_interval));
-                        else
-                                gpio_keys_report_event(button, bdata->input);
-
-                        return IRQ_HANDLED;
-                }
-        }
+        if (button->debounce_interval)
+                mod_timer(&bdata->timer,
+                        jiffies + msecs_to_jiffies(button->debounce_interval));
+        else
+                gpio_keys_report_event(button, bdata->input);
 
-        return IRQ_NONE;
+        return IRQ_HANDLED;
 }
 
 static int __devinit gpio_keys_probe(struct platform_device *pdev)
@@ -151,7 +140,7 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev)
                                     IRQF_SAMPLE_RANDOM | IRQF_TRIGGER_RISING |
                                         IRQF_TRIGGER_FALLING,
                                     button->desc ? button->desc : "gpio_keys",
-                                    pdev);
+                                    bdata);
                 if (error) {
                         pr_err("gpio-keys: Unable to claim irq %d; error %d\n",
                                 irq, error);
@@ -178,7 +167,7 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev)
 
  fail2:
         while (--i >= 0) {
-                free_irq(gpio_to_irq(pdata->buttons[i].gpio), pdev);
+                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);
                 gpio_free(pdata->buttons[i].gpio);
@@ -203,7 +192,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, pdev);
+                free_irq(irq, &ddata->data[i]);
                 if (pdata->buttons[i].debounce_interval)
                         del_timer_sync(&ddata->data[i].timer);
                 gpio_free(pdata->buttons[i].gpio);