Merge branch 'next' into for-linus

1 files changed, 7 insertions, 49 deletions

diff --git a/drivers/input/input.c b/drivers/input/input.c
index b8894a059f87..d6e8bd8a851c 100644
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -26,7 +26,6 @@
 #include <linux/device.h>
 #include <linux/mutex.h>
 #include <linux/rcupdate.h>
-#include <linux/smp_lock.h>
 #include "input-compat.h"
 
 MODULE_AUTHOR("Vojtech Pavlik <vojtech@suse.cz>");
@@ -792,22 +791,9 @@ int input_get_keycode(struct input_dev *dev, struct input_keymap_entry *ke)
         int retval;
 
         spin_lock_irqsave(&dev->event_lock, flags);
-
-        if (dev->getkeycode) {
-                /*
-                 * Support for legacy drivers, that don't implement the new
-                 * ioctls
-                 */
-                u32 scancode = ke->index;
-
-                memcpy(ke->scancode, &scancode, sizeof(scancode));
-                ke->len = sizeof(scancode);
-                retval = dev->getkeycode(dev, scancode, &ke->keycode);
-        } else {
-                retval = dev->getkeycode_new(dev, ke);
-        }
-
+        retval = dev->getkeycode(dev, ke);
         spin_unlock_irqrestore(&dev->event_lock, flags);
+
         return retval;
 }
 EXPORT_SYMBOL(input_get_keycode);
@@ -832,35 +818,7 @@ int input_set_keycode(struct input_dev *dev,
 
         spin_lock_irqsave(&dev->event_lock, flags);
 
-        if (dev->setkeycode) {
-                /*
-                 * Support for legacy drivers, that don't implement the new
-                 * ioctls
-                 */
-                unsigned int scancode;
-
-                retval = input_scancode_to_scalar(ke, &scancode);
-                if (retval)
-                        goto out;
-
-                /*
-                 * We need to know the old scancode, in order to generate a
-                 * keyup effect, if the set operation happens successfully
-                 */
-                if (!dev->getkeycode) {
-                        retval = -EINVAL;
-                        goto out;
-                }
-
-                retval = dev->getkeycode(dev, scancode, &old_keycode);
-                if (retval)
-                        goto out;
-
-                retval = dev->setkeycode(dev, scancode, ke->keycode);
-        } else {
-                retval = dev->setkeycode_new(dev, ke, &old_keycode);
-        }
-
+        retval = dev->setkeycode(dev, ke, &old_keycode);
         if (retval)
                 goto out;
 
@@ -1847,11 +1805,11 @@ int input_register_device(struct input_dev *dev)
                 dev->rep[REP_PERIOD] = 33;
         }
 
-        if (!dev->getkeycode && !dev->getkeycode_new)
-                dev->getkeycode_new = input_default_getkeycode;
+        if (!dev->getkeycode)
+                dev->getkeycode = input_default_getkeycode;
 
-        if (!dev->setkeycode && !dev->setkeycode_new)
-                dev->setkeycode_new = input_default_setkeycode;
+        if (!dev->setkeycode)
+                dev->setkeycode = input_default_setkeycode;
 
         dev_set_name(&dev->dev, "input%ld",
                      (unsigned long) atomic_inc_return(&input_no) - 1);