Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (32 commits)
  Input: wm97xx - update email address for Liam Girdwood
  Input: i8042 - add Thinkpad R31 to nomux list
  Input: move map_to_7segment.h to include/linux
  Input: ads7846 - fix cache line sharing issue
  Input: cm109 - add missing newlines to messages
  Input: document i8042.debug in kernel-parameters.txt
  Input: keyboard - fix potential out of bound access to key_map
  Input: psmouse - add OLPC touchpad driver
  Input: psmouse - tweak PSMOUSE_DEFINE_ATTR to support raw set callbacks
  Input: psmouse - add psmouse_queue_work() for ps/2 extension to make use of
  Input: psmouse - export psmouse_set_state for ps/2 extensions to use
  Input: ads7846 - introduce .gpio_pendown to get pendown state
  Input: ALPS - add signature for DualPoint found in Dell Latitude E6500
  Input: serio_raw - allow attaching to translated (SERIO_I8042XL) ports
  Input: cm109 - don't use obsolete logging macros
  Input: atkbd - expand Latitude's force release quirk to other Dells
  Input: bf54x-keys - add power management support
  Input: atmel_tsadcc - improve accuracy
  Input: convert drivers to use strict_strtoul()
  Input: appletouch - handle geyser 3/4 status bits
  ...

3 files changed, 38 insertions, 47 deletions

diff --git a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c
index b1ce10f50bcf..22016ca15351 100644
--- a/drivers/input/keyboard/atkbd.c
+++ b/drivers/input/keyboard/atkbd.c
@@ -834,10 +834,10 @@ static void atkbd_disconnect(struct serio *serio)
 }
 
 /*
- * Most special keys (Fn+F?) on Dell Latitudes do not generate release
+ * Most special keys (Fn+F?) on Dell laptops do not generate release
  * events so we have to do it ourselves.
  */
-static void atkbd_latitude_keymap_fixup(struct atkbd *atkbd)
+static void atkbd_dell_laptop_keymap_fixup(struct atkbd *atkbd)
 {
         const unsigned int forced_release_keys[] = {
                 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8f, 0x93,
@@ -1207,15 +1207,13 @@ static ssize_t atkbd_set_extra(struct atkbd *atkbd, const char *buf, size_t coun
 {
         struct input_dev *old_dev, *new_dev;
         unsigned long value;
-        char *rest;
         int err;
         unsigned char old_extra, old_set;
 
         if (!atkbd->write)
                 return -EIO;
 
-        value = simple_strtoul(buf, &rest, 10);
-        if (*rest || value > 1)
+        if (strict_strtoul(buf, 10, &value) || value > 1)
                 return -EINVAL;
 
         if (atkbd->extra != value) {
@@ -1264,12 +1262,10 @@ static ssize_t atkbd_set_scroll(struct atkbd *atkbd, const char *buf, size_t cou
 {
         struct input_dev *old_dev, *new_dev;
         unsigned long value;
-        char *rest;
         int err;
         unsigned char old_scroll;
 
-        value = simple_strtoul(buf, &rest, 10);
-        if (*rest || value > 1)
+        if (strict_strtoul(buf, 10, &value) || value > 1)
                 return -EINVAL;
 
         if (atkbd->scroll != value) {
@@ -1310,15 +1306,13 @@ static ssize_t atkbd_set_set(struct atkbd *atkbd, const char *buf, size_t count)
 {
         struct input_dev *old_dev, *new_dev;
         unsigned long value;
-        char *rest;
         int err;
         unsigned char old_set, old_extra;
 
         if (!atkbd->write)
                 return -EIO;
 
-        value = simple_strtoul(buf, &rest, 10);
-        if (*rest || (value != 2 && value != 3))
+        if (strict_strtoul(buf, 10, &value) || (value != 2 && value != 3))
                 return -EINVAL;
 
         if (atkbd->set != value) {
@@ -1361,15 +1355,13 @@ static ssize_t atkbd_set_softrepeat(struct atkbd *atkbd, const char *buf, size_t
 {
         struct input_dev *old_dev, *new_dev;
         unsigned long value;
-        char *rest;
         int err;
         unsigned char old_softrepeat, old_softraw;
 
         if (!atkbd->write)
                 return -EIO;
 
-        value = simple_strtoul(buf, &rest, 10);
-        if (*rest || value > 1)
+        if (strict_strtoul(buf, 10, &value) || value > 1)
                 return -EINVAL;
 
         if (atkbd->softrepeat != value) {
@@ -1413,12 +1405,10 @@ static ssize_t atkbd_set_softraw(struct atkbd *atkbd, const char *buf, size_t co
 {
         struct input_dev *old_dev, *new_dev;
         unsigned long value;
-        char *rest;
         int err;
         unsigned char old_softraw;
 
-        value = simple_strtoul(buf, &rest, 10);
-        if (*rest || value > 1)
+        if (strict_strtoul(buf, 10, &value) || value > 1)
                 return -EINVAL;
 
         if (atkbd->softraw != value) {
@@ -1461,13 +1451,13 @@ static int __init atkbd_setup_fixup(const struct dmi_system_id *id)
 
 static struct dmi_system_id atkbd_dmi_quirk_table[] __initdata = {
         {
-                .ident = "Dell Latitude series",
+                .ident = "Dell Laptop",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
-                        DMI_MATCH(DMI_PRODUCT_NAME, "Latitude"),
+                        DMI_MATCH(DMI_CHASSIS_TYPE, "8"), /* Portable */
                 },
                 .callback = atkbd_setup_fixup,
-                .driver_data = atkbd_latitude_keymap_fixup,
+                .driver_data = atkbd_dell_laptop_keymap_fixup,
         },
         {
                 .ident = "HP 2133",
diff --git a/drivers/input/keyboard/bf54x-keys.c b/drivers/input/keyboard/bf54x-keys.c
index e348cfccc17a..19284016e0f4 100644
--- a/drivers/input/keyboard/bf54x-keys.c
+++ b/drivers/input/keyboard/bf54x-keys.c
@@ -8,7 +8,7 @@
  *
  *
  * Modified:
- *               Copyright 2007 Analog Devices Inc.
+ *               Copyright 2007-2008 Analog Devices Inc.
  *
  * Bugs:         Enter bugs at http://blackfin.uclinux.org/
  *
@@ -81,6 +81,9 @@ struct bf54x_kpad {
         unsigned short *keycode;
         struct timer_list timer;
         unsigned int keyup_test_jiffies;
+        unsigned short kpad_msel;
+        unsigned short kpad_prescale;
+        unsigned short kpad_ctl;
 };
 
 static inline int bfin_kpad_find_key(struct bf54x_kpad *bf54x_kpad,
@@ -360,6 +363,10 @@ static int bfin_kpad_suspend(struct platform_device *pdev, pm_message_t state)
 {
         struct bf54x_kpad *bf54x_kpad = platform_get_drvdata(pdev);
 
+        bf54x_kpad->kpad_msel = bfin_read_KPAD_MSEL();
+        bf54x_kpad->kpad_prescale = bfin_read_KPAD_PRESCALE();
+        bf54x_kpad->kpad_ctl = bfin_read_KPAD_CTL();
+
         if (device_may_wakeup(&pdev->dev))
                 enable_irq_wake(bf54x_kpad->irq);
 
@@ -370,6 +377,10 @@ static int bfin_kpad_resume(struct platform_device *pdev)
 {
         struct bf54x_kpad *bf54x_kpad = platform_get_drvdata(pdev);
 
+        bfin_write_KPAD_MSEL(bf54x_kpad->kpad_msel);
+        bfin_write_KPAD_PRESCALE(bf54x_kpad->kpad_prescale);
+        bfin_write_KPAD_CTL(bf54x_kpad->kpad_ctl);
+
         if (device_may_wakeup(&pdev->dev))
                 disable_irq_wake(bf54x_kpad->irq);
 
diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c
index ec96b369dd7a..05f3f43582c2 100644
--- a/drivers/input/keyboard/gpio_keys.c
+++ b/drivers/input/keyboard/gpio_keys.c
@@ -36,9 +36,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;
 
@@ -50,34 +51,23 @@ 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)
 {
-        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(bdata);
 
-        return IRQ_NONE;
+        return IRQ_HANDLED;
 }
 
 static int __devinit gpio_keys_probe(struct platform_device *pdev)
@@ -151,7 +141,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 +168,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 +193,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);