OSDN Git Service

staging: unisys: visorinput: remove extraneous do_key function
authorTim Sell <Timothy.Sell@unisys.com>
Fri, 2 Oct 2015 17:19:25 +0000 (13:19 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 4 Oct 2015 08:53:34 +0000 (09:53 +0100)
do_key() is no longer needed.

Signed-off-by: Tim Sell <Timothy.Sell@unisys.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/unisys/visorinput/visorinput.c

index a002e07..3a1b24f 100644 (file)
@@ -452,12 +452,6 @@ visorinput_remove(struct visor_device *dev)
        kfree(devdata);
 }
 
-static void
-do_key(struct input_dev *inpt, int keycode, int down)
-{
-       input_report_key(inpt, keycode, down);
-}
-
 /*
  * Make it so the current locking state of the locking key indicated by
  * <keycode> is as indicated by <desired_state> (1=locked, 0=unlocked).
@@ -490,9 +484,9 @@ handle_locking_key(struct input_dev *visorinput_dev,
                int old_state = (test_bit(led, visorinput_dev->led) != 0);
 
                if (old_state != desired_state) {
-                       do_key(visorinput_dev, keycode, 1);
+                       input_report_key(visorinput_dev, keycode, 1);
                        input_sync(visorinput_dev);
-                       do_key(visorinput_dev, keycode, 0);
+                       input_report_key(visorinput_dev, keycode, 0);
                        input_sync(visorinput_dev);
                        __change_bit(led, visorinput_dev->led);
                }
@@ -563,17 +557,17 @@ visorinput_channel_interrupt(struct visor_device *dev)
                keycode = scancode_to_keycode(scancode);
                switch (r.activity.action) {
                case inputaction_key_down:
-                       do_key(visorinput_dev, keycode, 1);
+                       input_report_key(visorinput_dev, keycode, 1);
                        input_sync(visorinput_dev);
                        break;
                case inputaction_key_up:
-                       do_key(visorinput_dev, keycode, 0);
+                       input_report_key(visorinput_dev, keycode, 0);
                        input_sync(visorinput_dev);
                        break;
                case inputaction_key_down_up:
-                       do_key(visorinput_dev, keycode, 1);
+                       input_report_key(visorinput_dev, keycode, 1);
                        input_sync(visorinput_dev);
-                       do_key(visorinput_dev, keycode, 0);
+                       input_report_key(visorinput_dev, keycode, 0);
                        input_sync(visorinput_dev);
                        break;
                case inputaction_set_locking_key_state: