rk: revert to v3.10

[firefly-linux-kernel-4.4.55.git] / drivers / input / serio / i8042.c

diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
index 9870c540e6fb1e9a82ccb06e164c9dc3a6c2c047..78e4de42efaacec53c29f740fafe490dead2af84 100644 (file)
--- a/drivers/input/serio/i8042.c
+++ b/drivers/input/serio/i8042.c
@@ -67,10 +67,6 @@ static bool i8042_notimeout;
 module_param_named(notimeout, i8042_notimeout, bool, 0);
 MODULE_PARM_DESC(notimeout, "Ignore timeouts signalled by i8042");
 
-static bool i8042_kbdreset;
-module_param_named(kbdreset, i8042_kbdreset, bool, 0);
-MODULE_PARM_DESC(kbdreset, "Reset device connected to KBD port");
-
 #ifdef CONFIG_X86
 static bool i8042_dritek;
 module_param_named(dritek, i8042_dritek, bool, 0);
@@ -786,16 +782,6 @@ static int __init i8042_check_aux(void)
        if (i8042_toggle_aux(true))
                return -1;
 
-/*
- * Reset keyboard (needed on some laptops to successfully detect
- * touchpad, e.g., some Gigabyte laptop models with Elantech
- * touchpads).
- */
-       if (i8042_kbdreset) {
-               pr_warn("Attempting to reset device connected to KBD port\n");
-               i8042_kbd_write(NULL, (unsigned char) 0xff);
-       }
-
 /*
  * Test AUX IRQ delivery to make sure BIOS did not grab the IRQ and
  * used it for a PCI card or somethig else.