Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

25 files changed, 791 insertions, 431 deletions

diff --git a/drivers/input/misc/88pm860x_onkey.c b/drivers/input/misc/88pm860x_onkey.c
new file mode 100644
index 000000000000..40dabd8487b5
--- /dev/null
+++ b/drivers/input/misc/88pm860x_onkey.c
@@ -0,0 +1,156 @@
+/*
+ * 88pm860x_onkey.c - Marvell 88PM860x ONKEY driver
+ *
+ * Copyright (C) 2009-2010 Marvell International Ltd.
+ *      Haojian Zhuang <haojian.zhuang@marvell.com>
+ *
+ * This file is subject to the terms and conditions of the GNU General
+ * Public License. See the file "COPYING" in the main directory of this
+ * archive for more details.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/i2c.h>
+#include <linux/input.h>
+#include <linux/interrupt.h>
+#include <linux/mfd/88pm860x.h>
+#include <linux/slab.h>
+
+#define PM8607_WAKEUP           0x0b
+
+#define LONG_ONKEY_EN           (1 << 1)
+#define ONKEY_STATUS            (1 << 0)
+
+struct pm860x_onkey_info {
+        struct input_dev        *idev;
+        struct pm860x_chip      *chip;
+        struct i2c_client       *i2c;
+        struct device           *dev;
+        int                     irq;
+};
+
+/* 88PM860x gives us an interrupt when ONKEY is held */
+static irqreturn_t pm860x_onkey_handler(int irq, void *data)
+{
+        struct pm860x_onkey_info *info = data;
+        int ret;
+
+        ret = pm860x_reg_read(info->i2c, PM8607_STATUS_2);
+        ret &= ONKEY_STATUS;
+        input_report_key(info->idev, KEY_POWER, ret);
+        input_sync(info->idev);
+
+        /* Enable 8-second long onkey detection */
+        pm860x_set_bits(info->i2c, PM8607_WAKEUP, 3, LONG_ONKEY_EN);
+        return IRQ_HANDLED;
+}
+
+static int __devinit pm860x_onkey_probe(struct platform_device *pdev)
+{
+        struct pm860x_chip *chip = dev_get_drvdata(pdev->dev.parent);
+        struct pm860x_onkey_info *info;
+        int irq, ret;
+
+        irq = platform_get_irq(pdev, 0);
+        if (irq < 0) {
+                dev_err(&pdev->dev, "No IRQ resource!\n");
+                return -EINVAL;
+        }
+
+        info = kzalloc(sizeof(struct pm860x_onkey_info), GFP_KERNEL);
+        if (!info)
+                return -ENOMEM;
+        info->chip = chip;
+        info->i2c = (chip->id == CHIP_PM8607) ? chip->client : chip->companion;
+        info->dev = &pdev->dev;
+        info->irq = irq + chip->irq_base;
+
+        info->idev = input_allocate_device();
+        if (!info->idev) {
+                dev_err(chip->dev, "Failed to allocate input dev\n");
+                ret = -ENOMEM;
+                goto out;
+        }
+
+        info->idev->name = "88pm860x_on";
+        info->idev->phys = "88pm860x_on/input0";
+        info->idev->id.bustype = BUS_I2C;
+        info->idev->dev.parent = &pdev->dev;
+        info->irq = irq;
+        info->idev->evbit[0] = BIT_MASK(EV_KEY);
+        info->idev->keybit[BIT_WORD(KEY_POWER)] = BIT_MASK(KEY_POWER);
+
+        ret = input_register_device(info->idev);
+        if (ret) {
+                dev_err(chip->dev, "Can't register input device: %d\n", ret);
+                goto out_reg;
+        }
+
+        ret = request_threaded_irq(info->irq, NULL, pm860x_onkey_handler,
+                                   IRQF_ONESHOT, "onkey", info);
+        if (ret < 0) {
+                dev_err(chip->dev, "Failed to request IRQ: #%d: %d\n",
+                        info->irq, ret);
+                goto out_irq;
+        }
+
+        platform_set_drvdata(pdev, info);
+        return 0;
+
+out_irq:
+        input_unregister_device(info->idev);
+        kfree(info);
+        return ret;
+
+out_reg:
+        input_free_device(info->idev);
+out:
+        kfree(info);
+        return ret;
+}
+
+static int __devexit pm860x_onkey_remove(struct platform_device *pdev)
+{
+        struct pm860x_onkey_info *info = platform_get_drvdata(pdev);
+
+        free_irq(info->irq, info);
+        input_unregister_device(info->idev);
+        kfree(info);
+        return 0;
+}
+
+static struct platform_driver pm860x_onkey_driver = {
+        .driver         = {
+                .name   = "88pm860x-onkey",
+                .owner  = THIS_MODULE,
+        },
+        .probe          = pm860x_onkey_probe,
+        .remove         = __devexit_p(pm860x_onkey_remove),
+};
+
+static int __init pm860x_onkey_init(void)
+{
+        return platform_driver_register(&pm860x_onkey_driver);
+}
+module_init(pm860x_onkey_init);
+
+static void __exit pm860x_onkey_exit(void)
+{
+        platform_driver_unregister(&pm860x_onkey_driver);
+}
+module_exit(pm860x_onkey_exit);
+
+MODULE_DESCRIPTION("Marvell 88PM860x ONKEY driver");
+MODULE_AUTHOR("Haojian Zhuang <haojian.zhuang@marvell.com>");
+MODULE_LICENSE("GPL");
diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index a9bb2544b2de..23140a3bb8e0 100644
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -12,6 +12,16 @@ menuconfig INPUT_MISC
 
 if INPUT_MISC
 
+config INPUT_88PM860X_ONKEY
+        tristate "88PM860x ONKEY support"
+        depends on MFD_88PM860X
+        help
+          Support the ONKEY of Marvell 88PM860x PMICs as an input device
+          reporting power button status.
+
+          To compile this driver as a module, choose M here: the module
+          will be called 88pm860x_onkey.
+
 config INPUT_PCSPKR
         tristate "PC Speaker support"
         depends on PCSPKR_PLATFORM
@@ -80,6 +90,7 @@ config INPUT_WISTRON_BTNS
         tristate "x86 Wistron laptop button interface"
         depends on X86 && !X86_64
         select INPUT_POLLDEV
+        select INPUT_SPARSEKMAP
         select NEW_LEDS
         select LEDS_CLASS
         select CHECK_SIGNATURE
@@ -203,6 +214,17 @@ config INPUT_TWL4030_PWRBUTTON
           To compile this driver as a module, choose M here. The module will
           be called twl4030_pwrbutton.
 
+config INPUT_TWL4030_VIBRA
+        tristate "Support for TWL4030 Vibrator"
+        depends on TWL4030_CORE
+        select TWL4030_CODEC
+        select INPUT_FF_MEMLESS
+        help
+          This option enables support for TWL4030 Vibrator Driver.
+
+          To compile this driver as a module, choose M here. The module will
+          be called twl4030_vibra.
+
 config INPUT_UINPUT
         tristate "User level driver support"
         help
@@ -281,6 +303,7 @@ config INPUT_RB532_BUTTON
 config INPUT_DM355EVM
         tristate "TI DaVinci DM355 EVM Keypad and IR Remote"
         depends on MFD_DM355EVM_MSP
+        select INPUT_SPARSEKMAP
         help
           Supports the pushbuttons and IR remote used with
           the DM355 EVM board.
diff --git a/drivers/input/misc/Makefile b/drivers/input/misc/Makefile
index a8b84854fb7b..7e95a5d474dc 100644
--- a/drivers/input/misc/Makefile
+++ b/drivers/input/misc/Makefile
@@ -4,6 +4,7 @@
 
 # Each configuration option enables a list of files.
 
+obj-$(CONFIG_INPUT_88PM860X_ONKEY)      += 88pm860x_onkey.o
 obj-$(CONFIG_INPUT_APANEL)              += apanel.o
 obj-$(CONFIG_INPUT_ATI_REMOTE)          += ati_remote.o
 obj-$(CONFIG_INPUT_ATI_REMOTE2)         += ati_remote2.o
@@ -25,6 +26,7 @@ obj-$(CONFIG_INPUT_GPIO_ROTARY_ENCODER)	+= rotary_encoder.o
 obj-$(CONFIG_INPUT_SGI_BTNS)            += sgi_btns.o
 obj-$(CONFIG_INPUT_SPARCSPKR)           += sparcspkr.o
 obj-$(CONFIG_INPUT_TWL4030_PWRBUTTON)   += twl4030-pwrbutton.o
+obj-$(CONFIG_INPUT_TWL4030_VIBRA)       += twl4030-vibra.o
 obj-$(CONFIG_INPUT_UINPUT)              += uinput.o
 obj-$(CONFIG_INPUT_WINBOND_CIR)         += winbond-cir.o
 obj-$(CONFIG_INPUT_WISTRON_BTNS)        += wistron_btns.o
diff --git a/drivers/input/misc/apanel.c b/drivers/input/misc/apanel.c
index 71b82434264d..a8d2b8db4e35 100644
--- a/drivers/input/misc/apanel.c
+++ b/drivers/input/misc/apanel.c
@@ -149,7 +149,7 @@ static void apanel_shutdown(struct i2c_client *client)
         apanel_remove(client);
 }
 
-static struct i2c_device_id apanel_id[] = {
+static const struct i2c_device_id apanel_id[] = {
         { "fujitsu_apanel", 0 },
         { }
 };
diff --git a/drivers/input/misc/ati_remote.c b/drivers/input/misc/ati_remote.c
index e290fde35e74..e8bbc619f6df 100644
--- a/drivers/input/misc/ati_remote.c
+++ b/drivers/input/misc/ati_remote.c
@@ -98,10 +98,12 @@
  * Module and Version Information, Module Parameters
  */
 
-#define ATI_REMOTE_VENDOR_ID    0x0bc7
-#define ATI_REMOTE_PRODUCT_ID   0x004
-#define LOLA_REMOTE_PRODUCT_ID  0x002
-#define MEDION_REMOTE_PRODUCT_ID 0x006
+#define ATI_REMOTE_VENDOR_ID            0x0bc7
+#define LOLA_REMOTE_PRODUCT_ID          0x0002
+#define LOLA2_REMOTE_PRODUCT_ID         0x0003
+#define ATI_REMOTE_PRODUCT_ID           0x0004
+#define NVIDIA_REMOTE_PRODUCT_ID        0x0005
+#define MEDION_REMOTE_PRODUCT_ID        0x0006
 
 #define DRIVER_VERSION          "2.2.1"
 #define DRIVER_AUTHOR           "Torrey Hoffman <thoffman@arnor.net>"
@@ -142,8 +144,10 @@ MODULE_PARM_DESC(repeat_delay, "Delay before sending repeats, default = 500 msec
 #define err(format, arg...) printk(KERN_ERR format , ## arg)
 
 static struct usb_device_id ati_remote_table[] = {
-        { USB_DEVICE(ATI_REMOTE_VENDOR_ID, ATI_REMOTE_PRODUCT_ID) },
         { USB_DEVICE(ATI_REMOTE_VENDOR_ID, LOLA_REMOTE_PRODUCT_ID) },
+        { USB_DEVICE(ATI_REMOTE_VENDOR_ID, LOLA2_REMOTE_PRODUCT_ID) },
+        { USB_DEVICE(ATI_REMOTE_VENDOR_ID, ATI_REMOTE_PRODUCT_ID) },
+        { USB_DEVICE(ATI_REMOTE_VENDOR_ID, NVIDIA_REMOTE_PRODUCT_ID) },
         { USB_DEVICE(ATI_REMOTE_VENDOR_ID, MEDION_REMOTE_PRODUCT_ID) },
         {}      /* Terminating entry */
 };
@@ -766,7 +770,7 @@ static int ati_remote_probe(struct usb_interface *interface, const struct usb_de
         ati_remote->interface = interface;
 
         usb_make_path(udev, ati_remote->phys, sizeof(ati_remote->phys));
-        strlcpy(ati_remote->phys, "/input0", sizeof(ati_remote->phys));
+        strlcat(ati_remote->phys, "/input0", sizeof(ati_remote->phys));
 
         if (udev->manufacturer)
                 strlcpy(ati_remote->name, udev->manufacturer, sizeof(ati_remote->name));
diff --git a/drivers/input/misc/ati_remote2.c b/drivers/input/misc/ati_remote2.c
index 0501f0e65157..2124b99378bb 100644
--- a/drivers/input/misc/ati_remote2.c
+++ b/drivers/input/misc/ati_remote2.c
@@ -10,6 +10,7 @@
  */
 
 #include <linux/usb/input.h>
+#include <linux/slab.h>
 
 #define DRIVER_DESC    "ATI/Philips USB RF remote driver"
 #define DRIVER_VERSION "0.3"
@@ -474,10 +475,11 @@ static void ati_remote2_complete_key(struct urb *urb)
 }
 
 static int ati_remote2_getkeycode(struct input_dev *idev,
-                                  int scancode, int *keycode)
+                                  unsigned int scancode, unsigned int *keycode)
 {
         struct ati_remote2 *ar2 = input_get_drvdata(idev);
-        int index, mode;
+        unsigned int mode;
+        int index;
 
         mode = scancode >> 8;
         if (mode > ATI_REMOTE2_PC || !((1 << mode) & ar2->mode_mask))
@@ -491,10 +493,12 @@ static int ati_remote2_getkeycode(struct input_dev *idev,
         return 0;
 }
 
-static int ati_remote2_setkeycode(struct input_dev *idev, int scancode, int keycode)
+static int ati_remote2_setkeycode(struct input_dev *idev,
+                                  unsigned int scancode, unsigned int keycode)
 {
         struct ati_remote2 *ar2 = input_get_drvdata(idev);
-        int index, mode, old_keycode;
+        unsigned int mode, old_keycode;
+        int index;
 
         mode = scancode >> 8;
         if (mode > ATI_REMOTE2_PC || !((1 << mode) & ar2->mode_mask))
@@ -504,9 +508,6 @@ static int ati_remote2_setkeycode(struct input_dev *idev, int scancode, int keyc
         if (index < 0)
                 return -EINVAL;
 
-        if (keycode < KEY_RESERVED || keycode > KEY_MAX)
-                return -EINVAL;
-
         old_keycode = ar2->keycode[mode][index];
         ar2->keycode[mode][index] = keycode;
         __set_bit(keycode, idev->keybit);
diff --git a/drivers/input/misc/atlas_btns.c b/drivers/input/misc/atlas_btns.c
index 1b871917340a..dfaa9a045ed8 100644
--- a/drivers/input/misc/atlas_btns.c
+++ b/drivers/input/misc/atlas_btns.c
@@ -47,7 +47,7 @@ static acpi_status acpi_atlas_button_setup(acpi_handle region_handle,
 
 static acpi_status acpi_atlas_button_handler(u32 function,
                       acpi_physical_address address,
-                      u32 bit_width, acpi_integer *value,
+                      u32 bit_width, u64 *value,
                       void *handler_context, void *region_context)
 {
         acpi_status status;
diff --git a/drivers/input/misc/bfin_rotary.c b/drivers/input/misc/bfin_rotary.c
index 690f3fafa03b..4f72bdd69410 100644
--- a/drivers/input/misc/bfin_rotary.c
+++ b/drivers/input/misc/bfin_rotary.c
@@ -13,6 +13,7 @@
 #include <linux/pm.h>
 #include <linux/platform_device.h>
 #include <linux/input.h>
+#include <linux/slab.h>
 
 #include <asm/portmux.h>
 #include <asm/bfin_rotary.h>
@@ -247,7 +248,7 @@ static int bfin_rotary_resume(struct device *dev)
         return 0;
 }
 
-static struct dev_pm_ops bfin_rotary_pm_ops = {
+static const struct dev_pm_ops bfin_rotary_pm_ops = {
         .suspend        = bfin_rotary_suspend,
         .resume         = bfin_rotary_resume,
 };
diff --git a/drivers/input/misc/cobalt_btns.c b/drivers/input/misc/cobalt_btns.c
index ee73d7219c92..fd8407a29631 100644
--- a/drivers/input/misc/cobalt_btns.c
+++ b/drivers/input/misc/cobalt_btns.c
@@ -22,6 +22,7 @@
 #include <linux/ioport.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
+#include <linux/slab.h>
 
 #define BUTTONS_POLL_INTERVAL   30      /* msec */
 #define BUTTONS_COUNT_THRESHOLD 3
diff --git a/drivers/input/misc/dm355evm_keys.c b/drivers/input/misc/dm355evm_keys.c
index f2b67dc81d80..19af682c24fb 100644
--- a/drivers/input/misc/dm355evm_keys.c
+++ b/drivers/input/misc/dm355evm_keys.c
@@ -10,7 +10,9 @@
  */
 #include <linux/kernel.h>
 #include <linux/init.h>
+#include <linux/slab.h>
 #include <linux/input.h>
+#include <linux/input/sparse-keymap.h>
 #include <linux/platform_device.h>
 #include <linux/interrupt.h>
 
@@ -33,12 +35,8 @@ struct dm355evm_keys {
         int                     irq;
 };
 
-/* These initial keycodes can be remapped by dm355evm_setkeycode(). */
-static struct {
-        u16     event;
-        u16     keycode;
-} dm355evm_keys[] = {
-
+/* These initial keycodes can be remapped */
+static const struct key_entry dm355evm_keys[] = {
         /*
          * Pushbuttons on the EVM board ... note that the labels for these
          * are SW10/SW11/etc on the PC board.  The left/right orientation
@@ -47,11 +45,11 @@ static struct {
          * is to the right.  (That is, rotate the board counter-clockwise
          * by 90 degrees from the SW10/etc and "DM355 EVM" labels.)
          */
-        { 0x00d8, KEY_OK, },            /* SW12 */
-        { 0x00b8, KEY_UP, },            /* SW13 */
-        { 0x00e8, KEY_DOWN, },          /* SW11 */
-        { 0x0078, KEY_LEFT, },          /* SW14 */
-        { 0x00f0, KEY_RIGHT, },         /* SW10 */
+        { KE_KEY, 0x00d8, { KEY_OK } },         /* SW12 */
+        { KE_KEY, 0x00b8, { KEY_UP } },         /* SW13 */
+        { KE_KEY, 0x00e8, { KEY_DOWN } },       /* SW11 */
+        { KE_KEY, 0x0078, { KEY_LEFT } },       /* SW14 */
+        { KE_KEY, 0x00f0, { KEY_RIGHT } },      /* SW10 */
 
         /*
          * IR buttons ... codes assigned to match the universal remote
@@ -65,35 +63,35 @@ static struct {
          * RC5 codes are 14 bits, with two start bits (0x3 prefix)
          * and a toggle bit (masked out below).
          */
-        { 0x300c, KEY_POWER, },         /* NOTE: docs omit this */
-        { 0x3000, KEY_NUMERIC_0, },
-        { 0x3001, KEY_NUMERIC_1, },
-        { 0x3002, KEY_NUMERIC_2, },
-        { 0x3003, KEY_NUMERIC_3, },
-        { 0x3004, KEY_NUMERIC_4, },
-        { 0x3005, KEY_NUMERIC_5, },
-        { 0x3006, KEY_NUMERIC_6, },
-        { 0x3007, KEY_NUMERIC_7, },
-        { 0x3008, KEY_NUMERIC_8, },
-        { 0x3009, KEY_NUMERIC_9, },
-        { 0x3022, KEY_ENTER, },
-        { 0x30ec, KEY_MODE, },          /* "tv/vcr/..." */
-        { 0x300f, KEY_SELECT, },        /* "info" */
-        { 0x3020, KEY_CHANNELUP, },     /* "up" */
-        { 0x302e, KEY_MENU, },          /* "in/out" */
-        { 0x3011, KEY_VOLUMEDOWN, },    /* "left" */
-        { 0x300d, KEY_MUTE, },          /* "ok" */
-        { 0x3010, KEY_VOLUMEUP, },      /* "right" */
-        { 0x301e, KEY_SUBTITLE, },      /* "cc" */
-        { 0x3021, KEY_CHANNELDOWN, },   /* "down" */
-        { 0x3022, KEY_PREVIOUS, },
-        { 0x3026, KEY_SLEEP, },
-        { 0x3172, KEY_REWIND, },        /* NOTE: docs wrongly say 0x30ca */
-        { 0x3175, KEY_PLAY, },
-        { 0x3174, KEY_FASTFORWARD, },
-        { 0x3177, KEY_RECORD, },
-        { 0x3176, KEY_STOP, },
-        { 0x3169, KEY_PAUSE, },
+        { KE_KEY, 0x300c, { KEY_POWER } },      /* NOTE: docs omit this */
+        { KE_KEY, 0x3000, { KEY_NUMERIC_0 } },
+        { KE_KEY, 0x3001, { KEY_NUMERIC_1 } },
+        { KE_KEY, 0x3002, { KEY_NUMERIC_2 } },
+        { KE_KEY, 0x3003, { KEY_NUMERIC_3 } },
+        { KE_KEY, 0x3004, { KEY_NUMERIC_4 } },
+        { KE_KEY, 0x3005, { KEY_NUMERIC_5 } },
+        { KE_KEY, 0x3006, { KEY_NUMERIC_6 } },
+        { KE_KEY, 0x3007, { KEY_NUMERIC_7 } },
+        { KE_KEY, 0x3008, { KEY_NUMERIC_8 } },
+        { KE_KEY, 0x3009, { KEY_NUMERIC_9 } },
+        { KE_KEY, 0x3022, { KEY_ENTER } },
+        { KE_KEY, 0x30ec, { KEY_MODE } },       /* "tv/vcr/..." */
+        { KE_KEY, 0x300f, { KEY_SELECT } },     /* "info" */
+        { KE_KEY, 0x3020, { KEY_CHANNELUP } },  /* "up" */
+        { KE_KEY, 0x302e, { KEY_MENU } },       /* "in/out" */
+        { KE_KEY, 0x3011, { KEY_VOLUMEDOWN } }, /* "left" */
+        { KE_KEY, 0x300d, { KEY_MUTE } },       /* "ok" */
+        { KE_KEY, 0x3010, { KEY_VOLUMEUP } },   /* "right" */
+        { KE_KEY, 0x301e, { KEY_SUBTITLE } },   /* "cc" */
+        { KE_KEY, 0x3021, { KEY_CHANNELDOWN } },/* "down" */
+        { KE_KEY, 0x3022, { KEY_PREVIOUS } },
+        { KE_KEY, 0x3026, { KEY_SLEEP } },
+        { KE_KEY, 0x3172, { KEY_REWIND } },     /* NOTE: docs wrongly say 0x30ca */
+        { KE_KEY, 0x3175, { KEY_PLAY } },
+        { KE_KEY, 0x3174, { KEY_FASTFORWARD } },
+        { KE_KEY, 0x3177, { KEY_RECORD } },
+        { KE_KEY, 0x3176, { KEY_STOP } },
+        { KE_KEY, 0x3169, { KEY_PAUSE } },
 };
 
 /*
@@ -105,19 +103,18 @@ static struct {
  */
 static irqreturn_t dm355evm_keys_irq(int irq, void *_keys)
 {
-        struct dm355evm_keys    *keys = _keys;
-        int                     status;
+        static u16 last_event;
+        struct dm355evm_keys *keys = _keys;
+        const struct key_entry *ke;
+        unsigned int keycode;
+        int status;
+        u16 event;
 
         /* For simplicity we ignore INPUT_COUNT and just read
          * events until we get the "queue empty" indicator.
          * Reading INPUT_LOW decrements the count.
          */
         for (;;) {
-                static u16      last_event;
-                u16             event;
-                int             keycode;
-                int             i;
-
                 status = dm355evm_msp_read(DM355EVM_MSP_INPUT_HIGH);
                 if (status < 0) {
                         dev_dbg(keys->dev, "input high err %d\n",
@@ -156,14 +153,9 @@ static irqreturn_t dm355evm_keys_irq(int irq, void *_keys)
                 /* ignore the RC5 toggle bit */
                 event &= ~0x0800;
 
-                /* find the key, or leave it as unknown */
-                keycode = KEY_UNKNOWN;
-                for (i = 0; i < ARRAY_SIZE(dm355evm_keys); i++) {
-                        if (dm355evm_keys[i].event != event)
-                                continue;
-                        keycode = dm355evm_keys[i].keycode;
-                        break;
-                }
+                /* find the key, or report it as unknown */
+                ke = sparse_keymap_entry_from_scancode(keys->input, event);
+                keycode = ke ? ke->keycode : KEY_UNKNOWN;
                 dev_dbg(keys->dev,
                         "input event 0x%04x--> keycode %d\n",
                         event, keycode);
@@ -174,36 +166,8 @@ static irqreturn_t dm355evm_keys_irq(int irq, void *_keys)
                 input_report_key(keys->input, keycode, 0);
                 input_sync(keys->input);
         }
-        return IRQ_HANDLED;
-}
 
-static int dm355evm_setkeycode(struct input_dev *dev, int index, int keycode)
-{
-        u16             old_keycode;
-        unsigned        i;
-
-        if (((unsigned)index) >= ARRAY_SIZE(dm355evm_keys))
-                return -EINVAL;
-
-        old_keycode = dm355evm_keys[index].keycode;
-        dm355evm_keys[index].keycode = keycode;
-        set_bit(keycode, dev->keybit);
-
-        for (i = 0; i < ARRAY_SIZE(dm355evm_keys); i++) {
-                if (dm355evm_keys[index].keycode == old_keycode)
-                        goto done;
-        }
-        clear_bit(old_keycode, dev->keybit);
-done:
-        return 0;
-}
-
-static int dm355evm_getkeycode(struct input_dev *dev, int index, int *keycode)
-{
-        if (((unsigned)index) >= ARRAY_SIZE(dm355evm_keys))
-                return -EINVAL;
-
-        return dm355evm_keys[index].keycode;
+        return IRQ_HANDLED;
 }
 
 /*----------------------------------------------------------------------*/
@@ -213,7 +177,6 @@ static int __devinit dm355evm_keys_probe(struct platform_device *pdev)
         struct dm355evm_keys    *keys;
         struct input_dev        *input;
         int                     status;
-        int                     i;
 
         /* allocate instance struct and input dev */
         keys = kzalloc(sizeof *keys, GFP_KERNEL);
@@ -242,31 +205,30 @@ static int __devinit dm355evm_keys_probe(struct platform_device *pdev)
         input->id.product = 0x0355;
         input->id.version = dm355evm_msp_read(DM355EVM_MSP_FIRMREV);
 
-        input->evbit[0] = BIT(EV_KEY);
-        for (i = 0; i < ARRAY_SIZE(dm355evm_keys); i++)
-                __set_bit(dm355evm_keys[i].keycode, input->keybit);
-
-        input->setkeycode = dm355evm_setkeycode;
-        input->getkeycode = dm355evm_getkeycode;
+        status = sparse_keymap_setup(input, dm355evm_keys, NULL);
+        if (status)
+                goto fail1;
 
         /* REVISIT:  flush the event queue? */
 
         status = request_threaded_irq(keys->irq, NULL, dm355evm_keys_irq,
                         IRQF_TRIGGER_FALLING, dev_name(&pdev->dev), keys);
         if (status < 0)
-                goto fail1;
+                goto fail2;
 
         /* register */
         status = input_register_device(input);
         if (status < 0)
-                goto fail2;
+                goto fail3;
 
         platform_set_drvdata(pdev, keys);
 
         return 0;
 
-fail2:
+fail3:
         free_irq(keys->irq, keys);
+fail2:
+        sparse_keymap_free(input);
 fail1:
         input_free_device(input);
         kfree(keys);
@@ -280,6 +242,7 @@ static int __devexit dm355evm_keys_remove(struct platform_device *pdev)
         struct dm355evm_keys    *keys = platform_get_drvdata(pdev);
 
         free_irq(keys->irq, keys);
+        sparse_keymap_free(keys->input);
         input_unregister_device(keys->input);
         kfree(keys);
 
diff --git a/drivers/input/misc/hp_sdc_rtc.c b/drivers/input/misc/hp_sdc_rtc.c
index ea821b546969..ad730e15afc0 100644
--- a/drivers/input/misc/hp_sdc_rtc.c
+++ b/drivers/input/misc/hp_sdc_rtc.c
@@ -35,7 +35,6 @@
 
 #include <linux/hp_sdc.h>
 #include <linux/errno.h>
-#include <linux/smp_lock.h>
 #include <linux/types.h>
 #include <linux/init.h>
 #include <linux/module.h>
@@ -409,7 +408,6 @@ static unsigned int hp_sdc_rtc_poll(struct file *file, poll_table *wait)
 
 static int hp_sdc_rtc_open(struct inode *inode, struct file *file)
 {
-        cycle_kernel_lock();
         return 0;
 }
 
diff --git a/drivers/input/misc/pcap_keys.c b/drivers/input/misc/pcap_keys.c
index 7ea969347ca9..99335c286250 100644
--- a/drivers/input/misc/pcap_keys.c
+++ b/drivers/input/misc/pcap_keys.c
@@ -17,6 +17,7 @@
 #include <linux/platform_device.h>
 #include <linux/input.h>
 #include <linux/mfd/ezx-pcap.h>
+#include <linux/slab.h>
 
 struct pcap_keys {
         struct pcap_chip *pcap;
diff --git a/drivers/input/misc/pcf50633-input.c b/drivers/input/misc/pcf50633-input.c
index 039dcb00ebd9..95562735728d 100644
--- a/drivers/input/misc/pcf50633-input.c
+++ b/drivers/input/misc/pcf50633-input.c
@@ -20,6 +20,7 @@
 #include <linux/device.h>
 #include <linux/platform_device.h>
 #include <linux/input.h>
+#include <linux/slab.h>
 
 #include <linux/mfd/pcf50633/core.h>
 
@@ -55,7 +56,6 @@ pcf50633_input_irq(int irq, void *data)
 static int __devinit pcf50633_input_probe(struct platform_device *pdev)
 {
         struct pcf50633_input *input;
-        struct pcf50633_subdev_pdata *pdata = pdev->dev.platform_data;
         struct input_dev *input_dev;
         int ret;
 
@@ -71,7 +71,7 @@ static int __devinit pcf50633_input_probe(struct platform_device *pdev)
         }
 
         platform_set_drvdata(pdev, input);
-        input->pcf = pdata->pcf;
+        input->pcf = dev_to_pcf50633(pdev->dev.parent);
         input->input_dev = input_dev;
 
         input_dev->name = "PCF50633 PMU events";
@@ -85,9 +85,9 @@ static int __devinit pcf50633_input_probe(struct platform_device *pdev)
                 kfree(input);
                 return ret;
         }
-        pcf50633_register_irq(pdata->pcf, PCF50633_IRQ_ONKEYR,
+        pcf50633_register_irq(input->pcf, PCF50633_IRQ_ONKEYR,
                                 pcf50633_input_irq, input);
-        pcf50633_register_irq(pdata->pcf, PCF50633_IRQ_ONKEYF,
+        pcf50633_register_irq(input->pcf, PCF50633_IRQ_ONKEYF,
                                 pcf50633_input_irq, input);
 
         return 0;
diff --git a/drivers/input/misc/pcspkr.c b/drivers/input/misc/pcspkr.c
index 21cb755a54fb..ea4e1fd12651 100644
--- a/drivers/input/misc/pcspkr.c
+++ b/drivers/input/misc/pcspkr.c
@@ -127,7 +127,7 @@ static void pcspkr_shutdown(struct platform_device *dev)
         pcspkr_event(NULL, EV_SND, SND_BELL, 0);
 }
 
-static struct dev_pm_ops pcspkr_pm_ops = {
+static const struct dev_pm_ops pcspkr_pm_ops = {
         .suspend = pcspkr_suspend,
 };
 
diff --git a/drivers/input/misc/powermate.c b/drivers/input/misc/powermate.c
index a53c4885fbad..668913d12044 100644
--- a/drivers/input/misc/powermate.c
+++ b/drivers/input/misc/powermate.c
@@ -338,7 +338,7 @@ static int powermate_probe(struct usb_interface *intf, const struct usb_device_i
         pm->input = input_dev;
 
         usb_make_path(udev, pm->phys, sizeof(pm->phys));
-        strlcpy(pm->phys, "/input0", sizeof(pm->phys));
+        strlcat(pm->phys, "/input0", sizeof(pm->phys));
 
         spin_lock_init(&pm->lock);
 
diff --git a/drivers/input/misc/rotary_encoder.c b/drivers/input/misc/rotary_encoder.c
index 3b9f588fc747..1f8e0108962e 100644
--- a/drivers/input/misc/rotary_encoder.c
+++ b/drivers/input/misc/rotary_encoder.c
@@ -22,6 +22,7 @@
 #include <linux/platform_device.h>
 #include <linux/gpio.h>
 #include <linux/rotary_encoder.h>
+#include <linux/slab.h>
 
 #define DRV_NAME "rotary-encoder"
 
@@ -152,6 +153,13 @@ static int __devinit rotary_encoder_probe(struct platform_device *pdev)
                 goto exit_unregister_input;
         }
 
+        err = gpio_direction_input(pdata->gpio_a);
+        if (err) {
+                dev_err(&pdev->dev, "unable to set GPIO %d for input\n",
+                        pdata->gpio_a);
+                goto exit_unregister_input;
+        }
+
         err = gpio_request(pdata->gpio_b, DRV_NAME);
         if (err) {
                 dev_err(&pdev->dev, "unable to request GPIO %d\n",
@@ -159,6 +167,13 @@ static int __devinit rotary_encoder_probe(struct platform_device *pdev)
                 goto exit_free_gpio_a;
         }
 
+        err = gpio_direction_input(pdata->gpio_b);
+        if (err) {
+                dev_err(&pdev->dev, "unable to set GPIO %d for input\n",
+                        pdata->gpio_b);
+                goto exit_free_gpio_a;
+        }
+
         /* request the IRQs */
         err = request_irq(encoder->irq_a, &rotary_encoder_irq,
                           IORESOURCE_IRQ_HIGHEDGE | IORESOURCE_IRQ_LOWEDGE,
diff --git a/drivers/input/misc/sgi_btns.c b/drivers/input/misc/sgi_btns.c
index be3a15f5b25d..1a80c0dab83b 100644
--- a/drivers/input/misc/sgi_btns.c
+++ b/drivers/input/misc/sgi_btns.c
@@ -22,6 +22,7 @@
 #include <linux/ioport.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
+#include <linux/slab.h>
 
 #ifdef CONFIG_SGI_IP22
 #include <asm/sgi/ioc.h>
diff --git a/drivers/input/misc/sparcspkr.c b/drivers/input/misc/sparcspkr.c
index b064419b90a2..0d45422f8095 100644
--- a/drivers/input/misc/sparcspkr.c
+++ b/drivers/input/misc/sparcspkr.c
@@ -9,6 +9,7 @@
 #include <linux/init.h>
 #include <linux/input.h>
 #include <linux/of_device.h>
+#include <linux/slab.h>
 
 #include <asm/io.h>
 
diff --git a/drivers/input/misc/twl4030-pwrbutton.c b/drivers/input/misc/twl4030-pwrbutton.c
index f5fc9974a111..e9069b87fde2 100644
--- a/drivers/input/misc/twl4030-pwrbutton.c
+++ b/drivers/input/misc/twl4030-pwrbutton.c
@@ -27,7 +27,7 @@
 #include <linux/input.h>
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
-#include <linux/i2c/twl4030.h>
+#include <linux/i2c/twl.h>
 
 #define PWR_PWRON_IRQ (1 << 0)
 
@@ -39,18 +39,8 @@ static irqreturn_t powerbutton_irq(int irq, void *_pwr)
         int err;
         u8 value;
 
-#ifdef CONFIG_LOCKDEP
-        /* WORKAROUND for lockdep forcing IRQF_DISABLED on us, which
-         * we don't want and can't tolerate since this is a threaded
-         * IRQ and can sleep due to the i2c reads it has to issue.
-         * Although it might be friendlier not to borrow this thread
-         * context...
-         */
-        local_irq_enable();
-#endif
-
-        err = twl4030_i2c_read_u8(TWL4030_MODULE_PM_MASTER, &value,
-                                  STS_HW_CONDITIONS);
+        err = twl_i2c_read_u8(TWL4030_MODULE_PM_MASTER, &value,
+                                STS_HW_CONDITIONS);
         if (!err)  {
                 input_report_key(pwr, KEY_POWER, value & PWR_PWRON_IRQ);
                 input_sync(pwr);
@@ -80,7 +70,7 @@ static int __devinit twl4030_pwrbutton_probe(struct platform_device *pdev)
         pwr->phys = "twl4030_pwrbutton/input0";
         pwr->dev.parent = &pdev->dev;
 
-        err = request_irq(irq, powerbutton_irq,
+        err = request_threaded_irq(irq, NULL, powerbutton_irq,
                         IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING,
                         "twl4030_pwrbutton", pwr);
         if (err < 0) {
diff --git a/drivers/input/misc/twl4030-vibra.c b/drivers/input/misc/twl4030-vibra.c
new file mode 100644
index 000000000000..fee9eac8e04a
--- /dev/null
+++ b/drivers/input/misc/twl4030-vibra.c
@@ -0,0 +1,298 @@
+/*
+ * twl4030-vibra.c - TWL4030 Vibrator driver
+ *
+ * Copyright (C) 2008-2010 Nokia Corporation
+ *
+ * Written by Henrik Saari <henrik.saari@nokia.com>
+ * Updates by Felipe Balbi <felipe.balbi@nokia.com>
+ * Input by Jari Vanhala <ext-jari.vanhala@nokia.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+#include <linux/module.h>
+#include <linux/jiffies.h>
+#include <linux/platform_device.h>
+#include <linux/workqueue.h>
+#include <linux/i2c/twl.h>
+#include <linux/mfd/twl4030-codec.h>
+#include <linux/input.h>
+#include <linux/slab.h>
+
+/* MODULE ID2 */
+#define LEDEN           0x00
+
+/* ForceFeedback */
+#define EFFECT_DIR_180_DEG      0x8000 /* range is 0 - 0xFFFF */
+
+struct vibra_info {
+        struct device           *dev;
+        struct input_dev        *input_dev;
+
+        struct workqueue_struct *workqueue;
+        struct work_struct      play_work;
+
+        bool                    enabled;
+        int                     speed;
+        int                     direction;
+
+        bool                    coexist;
+};
+
+static void vibra_disable_leds(void)
+{
+        u8 reg;
+
+        /* Disable LEDA & LEDB, cannot be used with vibra (PWM) */
+        twl_i2c_read_u8(TWL4030_MODULE_LED, &reg, LEDEN);
+        reg &= ~0x03;
+        twl_i2c_write_u8(TWL4030_MODULE_LED, LEDEN, reg);
+}
+
+/* Powers H-Bridge and enables audio clk */
+static void vibra_enable(struct vibra_info *info)
+{
+        u8 reg;
+
+        twl4030_codec_enable_resource(TWL4030_CODEC_RES_POWER);
+
+        /* turn H-Bridge on */
+        twl_i2c_read_u8(TWL4030_MODULE_AUDIO_VOICE,
+                        &reg, TWL4030_REG_VIBRA_CTL);
+        twl_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE,
+                         (reg | TWL4030_VIBRA_EN), TWL4030_REG_VIBRA_CTL);
+
+        twl4030_codec_enable_resource(TWL4030_CODEC_RES_APLL);
+
+        info->enabled = true;
+}
+
+static void vibra_disable(struct vibra_info *info)
+{
+        u8 reg;
+
+        /* Power down H-Bridge */
+        twl_i2c_read_u8(TWL4030_MODULE_AUDIO_VOICE,
+                        &reg, TWL4030_REG_VIBRA_CTL);
+        twl_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE,
+                         (reg & ~TWL4030_VIBRA_EN), TWL4030_REG_VIBRA_CTL);
+
+        twl4030_codec_disable_resource(TWL4030_CODEC_RES_POWER);
+        twl4030_codec_disable_resource(TWL4030_CODEC_RES_APLL);
+
+        info->enabled = false;
+}
+
+static void vibra_play_work(struct work_struct *work)
+{
+        struct vibra_info *info = container_of(work,
+                        struct vibra_info, play_work);
+        int dir;
+        int pwm;
+        u8 reg;
+
+        dir = info->direction;
+        pwm = info->speed;
+
+        twl_i2c_read_u8(TWL4030_MODULE_AUDIO_VOICE,
+                        &reg, TWL4030_REG_VIBRA_CTL);
+        if (pwm && (!info->coexist || !(reg & TWL4030_VIBRA_SEL))) {
+
+                if (!info->enabled)
+                        vibra_enable(info);
+
+                /* set vibra rotation direction */
+                twl_i2c_read_u8(TWL4030_MODULE_AUDIO_VOICE,
+                                &reg, TWL4030_REG_VIBRA_CTL);
+                reg = (dir) ? (reg | TWL4030_VIBRA_DIR) :
+                        (reg & ~TWL4030_VIBRA_DIR);
+                twl_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE,
+                                 reg, TWL4030_REG_VIBRA_CTL);
+
+                /* set PWM, 1 = max, 255 = min */
+                twl_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE,
+                                 256 - pwm, TWL4030_REG_VIBRA_SET);
+        } else {
+                if (info->enabled)
+                        vibra_disable(info);
+        }
+}
+
+/*** Input/ForceFeedback ***/
+
+static int vibra_play(struct input_dev *input, void *data,
+                      struct ff_effect *effect)
+{
+        struct vibra_info *info = input_get_drvdata(input);
+
+        info->speed = effect->u.rumble.strong_magnitude >> 8;
+        if (!info->speed)
+                info->speed = effect->u.rumble.weak_magnitude >> 9;
+        info->direction = effect->direction < EFFECT_DIR_180_DEG ? 0 : 1;
+        queue_work(info->workqueue, &info->play_work);
+        return 0;
+}
+
+static int twl4030_vibra_open(struct input_dev *input)
+{
+        struct vibra_info *info = input_get_drvdata(input);
+
+        info->workqueue = create_singlethread_workqueue("vibra");
+        if (info->workqueue == NULL) {
+                dev_err(&input->dev, "couldn't create workqueue\n");
+                return -ENOMEM;
+        }
+        return 0;
+}
+
+static void twl4030_vibra_close(struct input_dev *input)
+{
+        struct vibra_info *info = input_get_drvdata(input);
+
+        cancel_work_sync(&info->play_work);
+        INIT_WORK(&info->play_work, vibra_play_work); /* cleanup */
+        destroy_workqueue(info->workqueue);
+        info->workqueue = NULL;
+
+        if (info->enabled)
+                vibra_disable(info);
+}
+
+/*** Module ***/
+#if CONFIG_PM
+static int twl4030_vibra_suspend(struct device *dev)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+        struct vibra_info *info = platform_get_drvdata(pdev);
+
+        if (info->enabled)
+                vibra_disable(info);
+
+        return 0;
+}
+
+static int twl4030_vibra_resume(struct device *dev)
+{
+        vibra_disable_leds();
+        return 0;
+}
+
+static SIMPLE_DEV_PM_OPS(twl4030_vibra_pm_ops,
+                         twl4030_vibra_suspend, twl4030_vibra_resume);
+#endif
+
+static int __devinit twl4030_vibra_probe(struct platform_device *pdev)
+{
+        struct twl4030_codec_vibra_data *pdata = pdev->dev.platform_data;
+        struct vibra_info *info;
+        int ret;
+
+        if (!pdata) {
+                dev_dbg(&pdev->dev, "platform_data not available\n");
+                return -EINVAL;
+        }
+
+        info = kzalloc(sizeof(*info), GFP_KERNEL);
+        if (!info)
+                return -ENOMEM;
+
+        info->dev = &pdev->dev;
+        info->coexist = pdata->coexist;
+        INIT_WORK(&info->play_work, vibra_play_work);
+
+        info->input_dev = input_allocate_device();
+        if (info->input_dev == NULL) {
+                dev_err(&pdev->dev, "couldn't allocate input device\n");
+                ret = -ENOMEM;
+                goto err_kzalloc;
+        }
+
+        input_set_drvdata(info->input_dev, info);
+
+        info->input_dev->name = "twl4030:vibrator";
+        info->input_dev->id.version = 1;
+        info->input_dev->dev.parent = pdev->dev.parent;
+        info->input_dev->open = twl4030_vibra_open;
+        info->input_dev->close = twl4030_vibra_close;
+        __set_bit(FF_RUMBLE, info->input_dev->ffbit);
+
+        ret = input_ff_create_memless(info->input_dev, NULL, vibra_play);
+        if (ret < 0) {
+                dev_dbg(&pdev->dev, "couldn't register vibrator to FF\n");
+                goto err_ialloc;
+        }
+
+        ret = input_register_device(info->input_dev);
+        if (ret < 0) {
+                dev_dbg(&pdev->dev, "couldn't register input device\n");
+                goto err_iff;
+        }
+
+        vibra_disable_leds();
+
+        platform_set_drvdata(pdev, info);
+        return 0;
+
+err_iff:
+        input_ff_destroy(info->input_dev);
+err_ialloc:
+        input_free_device(info->input_dev);
+err_kzalloc:
+        kfree(info);
+        return ret;
+}
+
+static int __devexit twl4030_vibra_remove(struct platform_device *pdev)
+{
+        struct vibra_info *info = platform_get_drvdata(pdev);
+
+        /* this also free ff-memless and calls close if needed */
+        input_unregister_device(info->input_dev);
+        kfree(info);
+        platform_set_drvdata(pdev, NULL);
+
+        return 0;
+}
+
+static struct platform_driver twl4030_vibra_driver = {
+        .probe          = twl4030_vibra_probe,
+        .remove         = __devexit_p(twl4030_vibra_remove),
+        .driver         = {
+                .name   = "twl4030_codec_vibra",
+                .owner  = THIS_MODULE,
+#ifdef CONFIG_PM
+                .pm     = &twl4030_vibra_pm_ops,
+#endif
+        },
+};
+
+static int __init twl4030_vibra_init(void)
+{
+        return platform_driver_register(&twl4030_vibra_driver);
+}
+module_init(twl4030_vibra_init);
+
+static void __exit twl4030_vibra_exit(void)
+{
+        platform_driver_unregister(&twl4030_vibra_driver);
+}
+module_exit(twl4030_vibra_exit);
+
+MODULE_ALIAS("platform:twl4030_codec_vibra");
+
+MODULE_DESCRIPTION("TWL4030 Vibra driver");
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Nokia Corporation");
diff --git a/drivers/input/misc/uinput.c b/drivers/input/misc/uinput.c
index d3f57245420a..1477466076ad 100644
--- a/drivers/input/misc/uinput.c
+++ b/drivers/input/misc/uinput.c
@@ -34,7 +34,6 @@
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/init.h>
-#include <linux/smp_lock.h>
 #include <linux/fs.h>
 #include <linux/miscdevice.h>
 #include <linux/uinput.h>
@@ -284,7 +283,6 @@ static int uinput_open(struct inode *inode, struct file *file)
         if (!newdev)
                 return -ENOMEM;
 
-        lock_kernel();
         mutex_init(&newdev->mutex);
         spin_lock_init(&newdev->requests_lock);
         init_waitqueue_head(&newdev->requests_waitq);
@@ -292,7 +290,7 @@ static int uinput_open(struct inode *inode, struct file *file)
         newdev->state = UIST_NEW_DEVICE;
 
         file->private_data = newdev;
-        unlock_kernel();
+        nonseekable_open(inode, file);
 
         return 0;
 }
diff --git a/drivers/input/misc/winbond-cir.c b/drivers/input/misc/winbond-cir.c
index 33309fe44e20..64f1de7960c6 100644
--- a/drivers/input/misc/winbond-cir.c
+++ b/drivers/input/misc/winbond-cir.c
@@ -56,6 +56,7 @@
 #include <linux/io.h>
 #include <linux/bitrev.h>
 #include <linux/bitops.h>
+#include <linux/slab.h>
 
 #define DRVNAME "winbond-cir"
 
@@ -385,26 +386,24 @@ wbcir_do_getkeycode(struct wbcir_data *data, u32 scancode)
 }
 
 static int
-wbcir_getkeycode(struct input_dev *dev, int scancode, int *keycode)
+wbcir_getkeycode(struct input_dev *dev,
+                 unsigned int scancode, unsigned int *keycode)
 {
         struct wbcir_data *data = input_get_drvdata(dev);
 
-        *keycode = (int)wbcir_do_getkeycode(data, (u32)scancode);
+        *keycode = wbcir_do_getkeycode(data, scancode);
         return 0;
 }
 
 static int
-wbcir_setkeycode(struct input_dev *dev, int sscancode, int keycode)
+wbcir_setkeycode(struct input_dev *dev,
+                 unsigned int scancode, unsigned int keycode)
 {
         struct wbcir_data *data = input_get_drvdata(dev);
         struct wbcir_keyentry *keyentry;
         struct wbcir_keyentry *new_keyentry;
         unsigned long flags;
         unsigned int old_keycode = KEY_RESERVED;
-        u32 scancode = (u32)sscancode;
-
-        if (keycode < 0 || keycode > KEY_MAX)
-                return -EINVAL;
 
         new_keyentry = kmalloc(sizeof(*new_keyentry), GFP_KERNEL);
         if (!new_keyentry)
@@ -538,6 +537,7 @@ wbcir_reset_irdata(struct wbcir_data *data)
         data->irdata_count = 0;
         data->irdata_off = 0;
         data->irdata_error = 0;
+        data->idle_count = 0;
 }
 
 /* Adds one bit of irdata */
@@ -768,7 +768,7 @@ wbcir_parse_rc6(struct device *dev, struct wbcir_data *data)
                 return;
         }
 
-        dev_info(dev, "IR-RC6 ad 0x%02X cm 0x%02X cu 0x%04X "
+        dev_dbg(dev, "IR-RC6 ad 0x%02X cm 0x%02X cu 0x%04X "
                 "toggle %u mode %u scan 0x%08X\n",
                 address,
                 command,
@@ -1006,7 +1006,6 @@ wbcir_irq_handler(int irqno, void *cookie)
                 }
 
                 wbcir_reset_irdata(data);
-                data->idle_count = 0;
         }
 
 out:
@@ -1018,7 +1017,7 @@ out:
 
 /*****************************************************************************
  *
- * SUSPEND/RESUME FUNCTIONS
+ * SETUP/INIT/SUSPEND/RESUME FUNCTIONS
  *
  *****************************************************************************/
 
@@ -1197,7 +1196,16 @@ finish:
         }
 
         /* Disable interrupts */
+        wbcir_select_bank(data, WBCIR_BANK_0);
         outb(WBCIR_IRQ_NONE, data->sbase + WBCIR_REG_SP3_IER);
+
+        /*
+         * ACPI will set the HW disable bit for SP3 which means that the
+         * output signals are left in an undefined state which may cause
+         * spurious interrupts which we need to ignore until the hardware
+         * is reinitialized.
+         */
+        disable_irq(data->irq);
 }
 
 static int
@@ -1207,37 +1215,15 @@ wbcir_suspend(struct pnp_dev *device, pm_message_t state)
         return 0;
 }
 
-static int
-wbcir_resume(struct pnp_dev *device)
-{
-        struct wbcir_data *data = pnp_get_drvdata(device);
-
-        /* Clear BUFF_EN, Clear END_EN, Clear MATCH_EN */
-        wbcir_set_bits(data->wbase + WBCIR_REG_WCEIR_EV_EN, 0x00, 0x07);
-
-        /* Clear CEIR_EN */
-        wbcir_set_bits(data->wbase + WBCIR_REG_WCEIR_CTL, 0x00, 0x01);
-
-        /* Enable interrupts */
-        wbcir_reset_irdata(data);
-        outb(WBCIR_IRQ_RX | WBCIR_IRQ_ERR, data->sbase + WBCIR_REG_SP3_IER);
-
-        return 0;
-}
-
-
-
-/*****************************************************************************
- *
- * SETUP/INIT FUNCTIONS
- *
- *****************************************************************************/
-
 static void
-wbcir_cfg_ceir(struct wbcir_data *data)
+wbcir_init_hw(struct wbcir_data *data)
 {
         u8 tmp;
 
+        /* Disable interrupts */
+        wbcir_select_bank(data, WBCIR_BANK_0);
+        outb(WBCIR_IRQ_NONE, data->sbase + WBCIR_REG_SP3_IER);
+
         /* Set PROT_SEL, RX_INV, Clear CEIR_EN (needed for the led) */
         tmp = protocol << 4;
         if (invert)
@@ -1264,6 +1250,93 @@ wbcir_cfg_ceir(struct wbcir_data *data)
          * set SP3_IRRX_SW to binary 01, helpfully not documented
          */
         outb(0x10, data->ebase + WBCIR_REG_ECEIR_CTS);
+
+        /* Enable extended mode */
+        wbcir_select_bank(data, WBCIR_BANK_2);
+        outb(WBCIR_EXT_ENABLE, data->sbase + WBCIR_REG_SP3_EXCR1);
+
+        /*
+         * Configure baud generator, IR data will be sampled at
+         * a bitrate of: (24Mhz * prescaler) / (divisor * 16).
+         *
+         * The ECIR registers include a flag to change the
+         * 24Mhz clock freq to 48Mhz.
+         *
+         * It's not documented in the specs, but fifo levels
+         * other than 16 seems to be unsupported.
+         */
+
+        /* prescaler 1.0, tx/rx fifo lvl 16 */
+        outb(0x30, data->sbase + WBCIR_REG_SP3_EXCR2);
+
+        /* Set baud divisor to generate one byte per bit/cell */
+        switch (protocol) {
+        case IR_PROTOCOL_RC5:
+                outb(0xA7, data->sbase + WBCIR_REG_SP3_BGDL);
+                break;
+        case IR_PROTOCOL_RC6:
+                outb(0x53, data->sbase + WBCIR_REG_SP3_BGDL);
+                break;
+        case IR_PROTOCOL_NEC:
+                outb(0x69, data->sbase + WBCIR_REG_SP3_BGDL);
+                break;
+        }
+        outb(0x00, data->sbase + WBCIR_REG_SP3_BGDH);
+
+        /* Set CEIR mode */
+        wbcir_select_bank(data, WBCIR_BANK_0);
+        outb(0xC0, data->sbase + WBCIR_REG_SP3_MCR);
+        inb(data->sbase + WBCIR_REG_SP3_LSR); /* Clear LSR */
+        inb(data->sbase + WBCIR_REG_SP3_MSR); /* Clear MSR */
+
+        /* Disable RX demod, run-length encoding/decoding, set freq span */
+        wbcir_select_bank(data, WBCIR_BANK_7);
+        outb(0x10, data->sbase + WBCIR_REG_SP3_RCCFG);
+
+        /* Disable timer */
+        wbcir_select_bank(data, WBCIR_BANK_4);
+        outb(0x00, data->sbase + WBCIR_REG_SP3_IRCR1);
+
+        /* Enable MSR interrupt, Clear AUX_IRX */
+        wbcir_select_bank(data, WBCIR_BANK_5);
+        outb(0x00, data->sbase + WBCIR_REG_SP3_IRCR2);
+
+        /* Disable CRC */
+        wbcir_select_bank(data, WBCIR_BANK_6);
+        outb(0x20, data->sbase + WBCIR_REG_SP3_IRCR3);
+
+        /* Set RX/TX (de)modulation freq, not really used */
+        wbcir_select_bank(data, WBCIR_BANK_7);
+        outb(0xF2, data->sbase + WBCIR_REG_SP3_IRRXDC);
+        outb(0x69, data->sbase + WBCIR_REG_SP3_IRTXMC);
+
+        /* Set invert and pin direction */
+        if (invert)
+                outb(0x10, data->sbase + WBCIR_REG_SP3_IRCFG4);
+        else
+                outb(0x00, data->sbase + WBCIR_REG_SP3_IRCFG4);
+
+        /* Set FIFO thresholds (RX = 8, TX = 3), reset RX/TX */
+        wbcir_select_bank(data, WBCIR_BANK_0);
+        outb(0x97, data->sbase + WBCIR_REG_SP3_FCR);
+
+        /* Clear AUX status bits */
+        outb(0xE0, data->sbase + WBCIR_REG_SP3_ASCR);
+
+        /* Enable interrupts */
+        wbcir_reset_irdata(data);
+        outb(WBCIR_IRQ_RX | WBCIR_IRQ_ERR, data->sbase + WBCIR_REG_SP3_IER);
+}
+
+static int
+wbcir_resume(struct pnp_dev *device)
+{
+        struct wbcir_data *data = pnp_get_drvdata(device);
+
+        wbcir_init_hw(data);
+        enable_irq(data->irq);
+
+        return 0;
 }
 
 static int __devinit
@@ -1393,86 +1466,7 @@ wbcir_probe(struct pnp_dev *device, const struct pnp_device_id *dev_id)
 
         device_init_wakeup(&device->dev, 1);
 
-        wbcir_cfg_ceir(data);
-
-        /* Disable interrupts */
-        wbcir_select_bank(data, WBCIR_BANK_0);
-        outb(WBCIR_IRQ_NONE, data->sbase + WBCIR_REG_SP3_IER);
-
-        /* Enable extended mode */
-        wbcir_select_bank(data, WBCIR_BANK_2);
-        outb(WBCIR_EXT_ENABLE, data->sbase + WBCIR_REG_SP3_EXCR1);
-
-        /*
-         * Configure baud generator, IR data will be sampled at
-         * a bitrate of: (24Mhz * prescaler) / (divisor * 16).
-         *
-         * The ECIR registers include a flag to change the
-         * 24Mhz clock freq to 48Mhz.
-         *
-         * It's not documented in the specs, but fifo levels
-         * other than 16 seems to be unsupported.
-         */
-
-        /* prescaler 1.0, tx/rx fifo lvl 16 */
-        outb(0x30, data->sbase + WBCIR_REG_SP3_EXCR2);
-
-        /* Set baud divisor to generate one byte per bit/cell */
-        switch (protocol) {
-        case IR_PROTOCOL_RC5:
-                outb(0xA7, data->sbase + WBCIR_REG_SP3_BGDL);
-                break;
-        case IR_PROTOCOL_RC6:
-                outb(0x53, data->sbase + WBCIR_REG_SP3_BGDL);
-                break;
-        case IR_PROTOCOL_NEC:
-                outb(0x69, data->sbase + WBCIR_REG_SP3_BGDL);
-                break;
-        }
-        outb(0x00, data->sbase + WBCIR_REG_SP3_BGDH);
-
-        /* Set CEIR mode */
-        wbcir_select_bank(data, WBCIR_BANK_0);
-        outb(0xC0, data->sbase + WBCIR_REG_SP3_MCR);
-        inb(data->sbase + WBCIR_REG_SP3_LSR); /* Clear LSR */
-        inb(data->sbase + WBCIR_REG_SP3_MSR); /* Clear MSR */
-
-        /* Disable RX demod, run-length encoding/decoding, set freq span */
-        wbcir_select_bank(data, WBCIR_BANK_7);
-        outb(0x10, data->sbase + WBCIR_REG_SP3_RCCFG);
-
-        /* Disable timer */
-        wbcir_select_bank(data, WBCIR_BANK_4);
-        outb(0x00, data->sbase + WBCIR_REG_SP3_IRCR1);
-
-        /* Enable MSR interrupt, Clear AUX_IRX */
-        wbcir_select_bank(data, WBCIR_BANK_5);
-        outb(0x00, data->sbase + WBCIR_REG_SP3_IRCR2);
-
-        /* Disable CRC */
-        wbcir_select_bank(data, WBCIR_BANK_6);
-        outb(0x20, data->sbase + WBCIR_REG_SP3_IRCR3);
-
-        /* Set RX/TX (de)modulation freq, not really used */
-        wbcir_select_bank(data, WBCIR_BANK_7);
-        outb(0xF2, data->sbase + WBCIR_REG_SP3_IRRXDC);
-        outb(0x69, data->sbase + WBCIR_REG_SP3_IRTXMC);
-
-        /* Set invert and pin direction */
-        if (invert)
-                outb(0x10, data->sbase + WBCIR_REG_SP3_IRCFG4);
-        else
-                outb(0x00, data->sbase + WBCIR_REG_SP3_IRCFG4);
-
-        /* Set FIFO thresholds (RX = 8, TX = 3), reset RX/TX */
-        wbcir_select_bank(data, WBCIR_BANK_0);
-        outb(0x97, data->sbase + WBCIR_REG_SP3_FCR);
-
-        /* Clear AUX status bits */
-        outb(0xE0, data->sbase + WBCIR_REG_SP3_ASCR);
-
-        /* Enable interrupts */
-        outb(WBCIR_IRQ_RX | WBCIR_IRQ_ERR, data->sbase + WBCIR_REG_SP3_IER);
+        wbcir_init_hw(data);
 
         return 0;
 
diff --git a/drivers/input/misc/wistron_btns.c b/drivers/input/misc/wistron_btns.c
index a932179c4c9e..04d5a4a3181f 100644
--- a/drivers/input/misc/wistron_btns.c
+++ b/drivers/input/misc/wistron_btns.c
@@ -21,6 +21,7 @@
 #include <linux/dmi.h>
 #include <linux/init.h>
 #include <linux/input-polldev.h>
+#include <linux/input/sparse-keymap.h>
 #include <linux/interrupt.h>
 #include <linux/jiffies.h>
 #include <linux/kernel.h>
@@ -28,6 +29,7 @@
 #include <linux/module.h>
 #include <linux/preempt.h>
 #include <linux/string.h>
+#include <linux/slab.h>
 #include <linux/types.h>
 #include <linux/platform_device.h>
 #include <linux/leds.h>
@@ -224,19 +226,8 @@ static void bios_set_state(u8 subsys, int enable)
 
 /* Hardware database */
 
-struct key_entry {
-        char type;              /* See KE_* below */
-        u8 code;
-        union {
-                u16 keycode;            /* For KE_KEY */
-                struct {                /* For KE_SW */
-                        u8 code;
-                        u8 value;
-                } sw;
-        };
-};
-
-enum { KE_END, KE_KEY, KE_SW, KE_WIFI, KE_BLUETOOTH };
+#define KE_WIFI         (KE_LAST + 1)
+#define KE_BLUETOOTH    (KE_LAST + 2)
 
 #define FE_MAIL_LED 0x01
 #define FE_WIFI_LED 0x02
@@ -644,10 +635,10 @@ static struct key_entry keymap_prestigio[] __initdata = {
  * a list of buttons and their key codes (reported when loading this module
  * with force=1) and the output of dmidecode to $MODULE_AUTHOR.
  */
-static struct dmi_system_id dmi_ids[] __initdata = {
+static const struct dmi_system_id __initconst dmi_ids[] = {
         {
+                /* Fujitsu-Siemens Amilo Pro V2000 */
                 .callback = dmi_matched,
-                .ident = "Fujitsu-Siemens Amilo Pro V2000",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"),
                         DMI_MATCH(DMI_PRODUCT_NAME, "AMILO Pro V2000"),
@@ -655,8 +646,8 @@ static struct dmi_system_id dmi_ids[] __initdata = {
                 .driver_data = keymap_fs_amilo_pro_v2000
         },
         {
+                /* Fujitsu-Siemens Amilo Pro Edition V3505 */
                 .callback = dmi_matched,
-                .ident = "Fujitsu-Siemens Amilo Pro Edition V3505",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"),
                         DMI_MATCH(DMI_PRODUCT_NAME, "AMILO Pro Edition V3505"),
@@ -664,8 +655,8 @@ static struct dmi_system_id dmi_ids[] __initdata = {
                 .driver_data = keymap_fs_amilo_pro_v3505
         },
         {
+                /* Fujitsu-Siemens Amilo M7400 */
                 .callback = dmi_matched,
-                .ident = "Fujitsu-Siemens Amilo M7400",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"),
                         DMI_MATCH(DMI_PRODUCT_NAME, "AMILO M        "),
@@ -673,8 +664,8 @@ static struct dmi_system_id dmi_ids[] __initdata = {
                 .driver_data = keymap_fs_amilo_pro_v2000
         },
         {
+                /* Maxdata Pro 7000 DX */
                 .callback = dmi_matched,
-                .ident = "Maxdata Pro 7000 DX",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "MAXDATA"),
                         DMI_MATCH(DMI_PRODUCT_NAME, "Pro 7000"),
@@ -682,8 +673,8 @@ static struct dmi_system_id dmi_ids[] __initdata = {
                 .driver_data = keymap_fs_amilo_pro_v2000
         },
         {
+                /* Fujitsu N3510 */
                 .callback = dmi_matched,
-                .ident = "Fujitsu N3510",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"),
                         DMI_MATCH(DMI_PRODUCT_NAME, "N3510"),
@@ -691,8 +682,8 @@ static struct dmi_system_id dmi_ids[] __initdata = {
                 .driver_data = keymap_fujitsu_n3510
         },
         {
+                /* Acer Aspire 1500 */
                 .callback = dmi_matched,
-                .ident = "Acer Aspire 1500",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
                         DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 1500"),
@@ -700,8 +691,8 @@ static struct dmi_system_id dmi_ids[] __initdata = {
                 .driver_data = keymap_acer_aspire_1500
         },
         {
+                /* Acer Aspire 1600 */
                 .callback = dmi_matched,
-                .ident = "Acer Aspire 1600",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
                         DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 1600"),
@@ -709,8 +700,8 @@ static struct dmi_system_id dmi_ids[] __initdata = {
                 .driver_data = keymap_acer_aspire_1600
         },
         {
+                /* Acer Aspire 3020 */
                 .callback = dmi_matched,
-                .ident = "Acer Aspire 3020",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
                         DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 3020"),
@@ -718,8 +709,8 @@ static struct dmi_system_id dmi_ids[] __initdata = {
                 .driver_data = keymap_acer_aspire_5020
         },
         {
+                /* Acer Aspire 5020 */
                 .callback = dmi_matched,
-                .ident = "Acer Aspire 5020",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
                         DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5020"),
@@ -727,8 +718,8 @@ static struct dmi_system_id dmi_ids[] __initdata = {
                 .driver_data = keymap_acer_aspire_5020
         },
         {
+                /* Acer TravelMate 2100 */
                 .callback = dmi_matched,
-                .ident = "Acer TravelMate 2100",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
                         DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 2100"),
@@ -736,8 +727,8 @@ static struct dmi_system_id dmi_ids[] __initdata = {
                 .driver_data = keymap_acer_aspire_5020
         },
         {
+                /* Acer TravelMate 2410 */
                 .callback = dmi_matched,
-                .ident = "Acer TravelMate 2410",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
                         DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 2410"),
@@ -745,8 +736,8 @@ static struct dmi_system_id dmi_ids[] __initdata = {
                 .driver_data = keymap_acer_travelmate_2410
         },
         {
+                /* Acer TravelMate C300 */
                 .callback = dmi_matched,
-                .ident = "Acer TravelMate C300",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
                         DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate C300"),
@@ -754,8 +745,8 @@ static struct dmi_system_id dmi_ids[] __initdata = {
                 .driver_data = keymap_acer_travelmate_300
         },
         {
+                /* Acer TravelMate C100 */
                 .callback = dmi_matched,
-                .ident = "Acer TravelMate C100",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
                         DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate C100"),
@@ -763,8 +754,8 @@ static struct dmi_system_id dmi_ids[] __initdata = {
                 .driver_data = keymap_acer_travelmate_300
         },
         {
+                /* Acer TravelMate C110 */
                 .callback = dmi_matched,
-                .ident = "Acer TravelMate C110",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
                         DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate C110"),
@@ -772,8 +763,8 @@ static struct dmi_system_id dmi_ids[] __initdata = {
                 .driver_data = keymap_acer_travelmate_110
         },
         {
+                /* Acer TravelMate 380 */
                 .callback = dmi_matched,
-                .ident = "Acer TravelMate 380",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
                         DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 380"),
@@ -781,8 +772,8 @@ static struct dmi_system_id dmi_ids[] __initdata = {
                 .driver_data = keymap_acer_travelmate_380
         },
         {
+                /* Acer TravelMate 370 */
                 .callback = dmi_matched,
-                .ident = "Acer TravelMate 370",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
                         DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 370"),
@@ -790,8 +781,8 @@ static struct dmi_system_id dmi_ids[] __initdata = {
                 .driver_data = keymap_acer_travelmate_380 /* keyboard minus 1 key */
         },
         {
+                /* Acer TravelMate 220 */
                 .callback = dmi_matched,
-                .ident = "Acer TravelMate 220",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
                         DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 220"),
@@ -799,8 +790,8 @@ static struct dmi_system_id dmi_ids[] __initdata = {
                 .driver_data = keymap_acer_travelmate_220
         },
         {
+                /* Acer TravelMate 260 */
                 .callback = dmi_matched,
-                .ident = "Acer TravelMate 260",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
                         DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 260"),
@@ -808,8 +799,8 @@ static struct dmi_system_id dmi_ids[] __initdata = {
                 .driver_data = keymap_acer_travelmate_220
         },
         {
+                /* Acer TravelMate 230 */
                 .callback = dmi_matched,
-                .ident = "Acer TravelMate 230",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
                         DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 230"),
@@ -818,8 +809,8 @@ static struct dmi_system_id dmi_ids[] __initdata = {
                 .driver_data = keymap_acer_travelmate_230
         },
         {
+                /* Acer TravelMate 280 */
                 .callback = dmi_matched,
-                .ident = "Acer TravelMate 280",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
                         DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 280"),
@@ -827,8 +818,8 @@ static struct dmi_system_id dmi_ids[] __initdata = {
                 .driver_data = keymap_acer_travelmate_230
         },
         {
+                /* Acer TravelMate 240 */
                 .callback = dmi_matched,
-                .ident = "Acer TravelMate 240",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
                         DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 240"),
@@ -836,8 +827,8 @@ static struct dmi_system_id dmi_ids[] __initdata = {
                 .driver_data = keymap_acer_travelmate_240
         },
         {
+                /* Acer TravelMate 250 */
                 .callback = dmi_matched,
-                .ident = "Acer TravelMate 250",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
                         DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 250"),
@@ -845,8 +836,8 @@ static struct dmi_system_id dmi_ids[] __initdata = {
                 .driver_data = keymap_acer_travelmate_240
         },
         {
+                /* Acer TravelMate 2424NWXCi */
                 .callback = dmi_matched,
-                .ident = "Acer TravelMate 2424NWXCi",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
                         DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 2420"),
@@ -854,8 +845,8 @@ static struct dmi_system_id dmi_ids[] __initdata = {
                 .driver_data = keymap_acer_travelmate_240
         },
         {
+                /* Acer TravelMate 350 */
                 .callback = dmi_matched,
-                .ident = "Acer TravelMate 350",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
                         DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 350"),
@@ -863,8 +854,8 @@ static struct dmi_system_id dmi_ids[] __initdata = {
                 .driver_data = keymap_acer_travelmate_350
         },
         {
+                /* Acer TravelMate 360 */
                 .callback = dmi_matched,
-                .ident = "Acer TravelMate 360",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
                         DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 360"),
@@ -872,8 +863,8 @@ static struct dmi_system_id dmi_ids[] __initdata = {
                 .driver_data = keymap_acer_travelmate_360
         },
         {
+                /* Acer TravelMate 610 */
                 .callback = dmi_matched,
-                .ident = "Acer TravelMate 610",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "ACER"),
                         DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 610"),
@@ -881,8 +872,8 @@ static struct dmi_system_id dmi_ids[] __initdata = {
                 .driver_data = keymap_acer_travelmate_610
         },
         {
+                /* Acer TravelMate 620 */
                 .callback = dmi_matched,
-                .ident = "Acer TravelMate 620",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
                         DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 620"),
@@ -890,8 +881,8 @@ static struct dmi_system_id dmi_ids[] __initdata = {
                 .driver_data = keymap_acer_travelmate_630
         },
         {
+                /* Acer TravelMate 630 */
                 .callback = dmi_matched,
-                .ident = "Acer TravelMate 630",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
                         DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 630"),
@@ -899,8 +890,8 @@ static struct dmi_system_id dmi_ids[] __initdata = {
                 .driver_data = keymap_acer_travelmate_630
         },
         {
+                /* AOpen 1559AS */
                 .callback = dmi_matched,
-                .ident = "AOpen 1559AS",
                 .matches = {
                         DMI_MATCH(DMI_PRODUCT_NAME, "E2U"),
                         DMI_MATCH(DMI_BOARD_NAME, "E2U"),
@@ -908,8 +899,8 @@ static struct dmi_system_id dmi_ids[] __initdata = {
                 .driver_data = keymap_aopen_1559as
         },
         {
+                /* Medion MD 9783 */
                 .callback = dmi_matched,
-                .ident = "Medion MD 9783",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "MEDIONNB"),
                         DMI_MATCH(DMI_PRODUCT_NAME, "MD 9783"),
@@ -917,8 +908,8 @@ static struct dmi_system_id dmi_ids[] __initdata = {
                 .driver_data = keymap_wistron_ms2111
         },
         {
+                /* Medion MD 40100 */
                 .callback = dmi_matched,
-                .ident = "Medion MD 40100",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "MEDIONNB"),
                         DMI_MATCH(DMI_PRODUCT_NAME, "WID2000"),
@@ -926,8 +917,8 @@ static struct dmi_system_id dmi_ids[] __initdata = {
                 .driver_data = keymap_wistron_md40100
         },
         {
+                /* Medion MD 2900 */
                 .callback = dmi_matched,
-                .ident = "Medion MD 2900",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "MEDIONNB"),
                         DMI_MATCH(DMI_PRODUCT_NAME, "WIM 2000"),
@@ -935,8 +926,8 @@ static struct dmi_system_id dmi_ids[] __initdata = {
                 .driver_data = keymap_wistron_md2900
         },
         {
+                /* Medion MD 42200 */
                 .callback = dmi_matched,
-                .ident = "Medion MD 42200",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "Medion"),
                         DMI_MATCH(DMI_PRODUCT_NAME, "WIM 2030"),
@@ -944,8 +935,8 @@ static struct dmi_system_id dmi_ids[] __initdata = {
                 .driver_data = keymap_fs_amilo_pro_v2000
         },
         {
+                /* Medion MD 96500 */
                 .callback = dmi_matched,
-                .ident = "Medion MD 96500",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "MEDIONPC"),
                         DMI_MATCH(DMI_PRODUCT_NAME, "WIM 2040"),
@@ -953,8 +944,8 @@ static struct dmi_system_id dmi_ids[] __initdata = {
                 .driver_data = keymap_wistron_md96500
         },
         {
+                /* Medion MD 95400 */
                 .callback = dmi_matched,
-                .ident = "Medion MD 95400",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "MEDIONPC"),
                         DMI_MATCH(DMI_PRODUCT_NAME, "WIM 2050"),
@@ -962,8 +953,8 @@ static struct dmi_system_id dmi_ids[] __initdata = {
                 .driver_data = keymap_wistron_md96500
         },
         {
+                /* Fujitsu Siemens Amilo D7820 */
                 .callback = dmi_matched,
-                .ident = "Fujitsu Siemens Amilo D7820",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"), /* not sure */
                         DMI_MATCH(DMI_PRODUCT_NAME, "Amilo D"),
@@ -971,8 +962,8 @@ static struct dmi_system_id dmi_ids[] __initdata = {
                 .driver_data = keymap_fs_amilo_d88x0
         },
         {
+                /* Fujitsu Siemens Amilo D88x0 */
                 .callback = dmi_matched,
-                .ident = "Fujitsu Siemens Amilo D88x0",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"),
                         DMI_MATCH(DMI_PRODUCT_NAME, "AMILO D"),
@@ -1037,21 +1028,6 @@ static unsigned long jiffies_last_press;
 static bool wifi_enabled;
 static bool bluetooth_enabled;
 
-static void report_key(struct input_dev *dev, unsigned int keycode)
-{
-        input_report_key(dev, keycode, 1);
-        input_sync(dev);
-        input_report_key(dev, keycode, 0);
-        input_sync(dev);
-}
-
-static void report_switch(struct input_dev *dev, unsigned int code, int value)
-{
-        input_report_switch(dev, code, value);
-        input_sync(dev);
-}
-
-
  /* led management */
 static void wistron_mail_led_set(struct led_classdev *led_cdev,
                                 enum led_brightness value)
@@ -1128,43 +1104,13 @@ static inline void wistron_led_resume(void)
                 led_classdev_resume(&wistron_wifi_led);
 }
 
-static struct key_entry *wistron_get_entry_by_scancode(int code)
-{
-        struct key_entry *key;
-
-        for (key = keymap; key->type != KE_END; key++)
-                if (code == key->code)
-                        return key;
-
-        return NULL;
-}
-
-static struct key_entry *wistron_get_entry_by_keycode(int keycode)
-{
-        struct key_entry *key;
-
-        for (key = keymap; key->type != KE_END; key++)
-                if (key->type == KE_KEY && keycode == key->keycode)
-                        return key;
-
-        return NULL;
-}
-
 static void handle_key(u8 code)
 {
-        const struct key_entry *key = wistron_get_entry_by_scancode(code);
+        const struct key_entry *key =
+                sparse_keymap_entry_from_scancode(wistron_idev->input, code);
 
         if (key) {
                 switch (key->type) {
-                case KE_KEY:
-                        report_key(wistron_idev->input, key->keycode);
-                        break;
-
-                case KE_SW:
-                        report_switch(wistron_idev->input,
-                                      key->sw.code, key->sw.value);
-                        break;
-
                 case KE_WIFI:
                         if (have_wifi) {
                                 wifi_enabled = !wifi_enabled;
@@ -1180,7 +1126,9 @@ static void handle_key(u8 code)
                         break;
 
                 default:
-                        BUG();
+                        sparse_keymap_report_entry(wistron_idev->input,
+                                                   key, 1, true);
+                        break;
                 }
                 jiffies_last_press = jiffies;
         } else
@@ -1220,42 +1168,39 @@ static void wistron_poll(struct input_polled_dev *dev)
                 dev->poll_interval = POLL_INTERVAL_DEFAULT;
 }
 
-static int wistron_getkeycode(struct input_dev *dev, int scancode, int *keycode)
+static int __devinit wistron_setup_keymap(struct input_dev *dev,
+                                          struct key_entry *entry)
 {
-        const struct key_entry *key = wistron_get_entry_by_scancode(scancode);
-
-        if (key && key->type == KE_KEY) {
-                *keycode = key->keycode;
-                return 0;
-        }
+        switch (entry->type) {
 
-        return -EINVAL;
-}
+        /* if wifi or bluetooth are not available, create normal keys */
+        case KE_WIFI:
+                if (!have_wifi) {
+                        entry->type = KE_KEY;
+                        entry->keycode = KEY_WLAN;
+                }
+                break;
 
-static int wistron_setkeycode(struct input_dev *dev, int scancode, int keycode)
-{
-        struct key_entry *key;
-        int old_keycode;
-
-        if (keycode < 0 || keycode > KEY_MAX)
-                return -EINVAL;
-
-        key = wistron_get_entry_by_scancode(scancode);
-        if (key && key->type == KE_KEY) {
-                old_keycode = key->keycode;
-                key->keycode = keycode;
-                set_bit(keycode, dev->keybit);
-                if (!wistron_get_entry_by_keycode(old_keycode))
-                        clear_bit(old_keycode, dev->keybit);
-                return 0;
+        case KE_BLUETOOTH:
+                if (!have_bluetooth) {
+                        entry->type = KE_KEY;
+                        entry->keycode = KEY_BLUETOOTH;
+                }
+                break;
+
+        case KE_END:
+                if (entry->code & FE_UNTESTED)
+                        printk(KERN_WARNING "Untested laptop multimedia keys, "
+                                "please report success or failure to "
+                                "eric.piel@tremplin-utc.net\n");
+                break;
         }
 
-        return -EINVAL;
+        return 0;
 }
 
 static int __devinit setup_input_dev(void)
 {
-        struct key_entry *key;
         struct input_dev *input_dev;
         int error;
 
@@ -1263,7 +1208,7 @@ static int __devinit setup_input_dev(void)
         if (!wistron_idev)
                 return -ENOMEM;
 
-        wistron_idev->flush = wistron_flush;
+        wistron_idev->open = wistron_flush;
         wistron_idev->poll = wistron_poll;
         wistron_idev->poll_interval = POLL_INTERVAL_DEFAULT;
 
@@ -1273,56 +1218,21 @@ static int __devinit setup_input_dev(void)
         input_dev->id.bustype = BUS_HOST;
         input_dev->dev.parent = &wistron_device->dev;
 
-        input_dev->getkeycode = wistron_getkeycode;
-        input_dev->setkeycode = wistron_setkeycode;
-
-        for (key = keymap; key->type != KE_END; key++) {
-                switch (key->type) {
-                        case KE_KEY:
-                                set_bit(EV_KEY, input_dev->evbit);
-                                set_bit(key->keycode, input_dev->keybit);
-                                break;
-
-                        case KE_SW:
-                                set_bit(EV_SW, input_dev->evbit);
-                                set_bit(key->sw.code, input_dev->swbit);
-                                break;
-
-                        /* if wifi or bluetooth are not available, create normal keys */
-                        case KE_WIFI:
-                                if (!have_wifi) {
-                                        key->type = KE_KEY;
-                                        key->keycode = KEY_WLAN;
-                                        key--;
-                                }
-                                break;
-
-                        case KE_BLUETOOTH:
-                                if (!have_bluetooth) {
-                                        key->type = KE_KEY;
-                                        key->keycode = KEY_BLUETOOTH;
-                                        key--;
-                                }
-                                break;
-
-                        default:
-                                break;
-                }
-        }
-
-        /* reads information flags on KE_END */
-        if (key->code & FE_UNTESTED)
-                printk(KERN_WARNING "Untested laptop multimedia keys, "
-                        "please report success or failure to eric.piel"
-                        "@tremplin-utc.net\n");
+        error = sparse_keymap_setup(input_dev, keymap, wistron_setup_keymap);
+        if (error)
+                goto err_free_dev;
 
         error = input_register_polled_device(wistron_idev);
-        if (error) {
-                input_free_polled_device(wistron_idev);
-                return error;
-        }
+        if (error)
+                goto err_free_keymap;
 
         return 0;
+
+ err_free_keymap:
+        sparse_keymap_free(input_dev);
+ err_free_dev:
+        input_free_polled_device(wistron_idev);
+        return error;
 }
 
 /* Driver core */
@@ -1371,6 +1281,7 @@ static int __devexit wistron_remove(struct platform_device *dev)
 {
         wistron_led_remove();
         input_unregister_polled_device(wistron_idev);
+        sparse_keymap_free(wistron_idev->input);
         input_free_polled_device(wistron_idev);
         bios_detach();
 
@@ -1418,7 +1329,7 @@ static struct platform_driver wistron_driver = {
         .driver         = {
                 .name   = "wistron-bios",
                 .owner  = THIS_MODULE,
-#if CONFIG_PM
+#ifdef CONFIG_PM
                 .pm     = &wistron_pm_ops,
 #endif
         },
diff --git a/drivers/input/misc/wm831x-on.c b/drivers/input/misc/wm831x-on.c
index ba4f5dd7c60e..c3d7ba5f5b47 100644
--- a/drivers/input/misc/wm831x-on.c
+++ b/drivers/input/misc/wm831x-on.c
@@ -19,6 +19,7 @@
 
 #include <linux/module.h>
 #include <linux/init.h>
+#include <linux/slab.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/input.h>
@@ -97,8 +98,9 @@ static int __devinit wm831x_on_probe(struct platform_device *pdev)
         wm831x_on->dev->phys = "wm831x_on/input0";
         wm831x_on->dev->dev.parent = &pdev->dev;
 
-        ret = wm831x_request_irq(wm831x, irq, wm831x_on_irq,
-                                 IRQF_TRIGGER_RISING, "wm831x_on", wm831x_on);
+        ret = request_threaded_irq(irq, NULL, wm831x_on_irq,
+                                   IRQF_TRIGGER_RISING, "wm831x_on",
+                                   wm831x_on);
         if (ret < 0) {
                 dev_err(&pdev->dev, "Unable to request IRQ: %d\n", ret);
                 goto err_input_dev;
@@ -114,7 +116,7 @@ static int __devinit wm831x_on_probe(struct platform_device *pdev)
         return 0;
 
 err_irq:
-        wm831x_free_irq(wm831x, irq, NULL);
+        free_irq(irq, wm831x_on);
 err_input_dev:
         input_free_device(wm831x_on->dev);
 err:
@@ -127,7 +129,7 @@ static int __devexit wm831x_on_remove(struct platform_device *pdev)
         struct wm831x_on *wm831x_on = platform_get_drvdata(pdev);
         int irq = platform_get_irq(pdev, 0);
 
-        wm831x_free_irq(wm831x_on->wm831x, irq, wm831x_on);
+        free_irq(irq, wm831x_on);
         cancel_delayed_work_sync(&wm831x_on->work);
         input_unregister_device(wm831x_on->dev);
         kfree(wm831x_on);
diff --git a/drivers/input/misc/yealink.h b/drivers/input/misc/yealink.h
index 48af0be9cbdf..1e0f52397010 100644
--- a/drivers/input/misc/yealink.h
+++ b/drivers/input/misc/yealink.h
@@ -127,7 +127,7 @@ struct yld_ctl_packet {
  * yld_status struct.
  */
 
-/* LCD, each segment must be driven seperately.
+/* LCD, each segment must be driven separately.
  *
  * Layout:
  *