Input: elantech - remove module parameter force_elantech
authorJJ Ding <jj_ding@emc.com.tw>
Wed, 21 Sep 2011 05:42:51 +0000 (22:42 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Wed, 21 Sep 2011 05:46:28 +0000 (22:46 -0700)
This essentially reverts commit f81bc788ff91d4efd4baf88b2c29713838caa8e5.

With recent work on elantech driver, I believe we now have complete support
for all elantech touchpads. So remove this hack.

Signed-off-by: JJ Ding <jj_ding@emc.com.tw>
Reviewed-by: Éric Piel <eric.piel@tremplin-utc.net>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
drivers/input/mouse/elantech.c

index c2d91ebbadf4a4ba321cc28c7ebeb3d0997e359a..25290b395c88020ec957ec11440cebdb428622d3 100644 (file)
                        printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__);  \
        } while (0)
 
-static bool force_elantech;
-module_param_named(force_elantech, force_elantech, bool, 0644);
-MODULE_PARM_DESC(force_elantech, "Force the Elantech PS/2 protocol extension to be used, 1 = enabled, 0 = disabled (default).");
-
 /*
  * Send a Synaptics style sliced query command
  */
@@ -1164,12 +1160,8 @@ int elantech_detect(struct psmouse *psmouse, bool set_properties)
                 param[0], param[1], param[2]);
 
        if (!elantech_is_signature_valid(param)) {
-               if (!force_elantech) {
-                       pr_debug("Probably not a real Elantech touchpad. Aborting.\n");
-                       return -1;
-               }
-
-               pr_debug("Probably not a real Elantech touchpad. Enabling anyway due to force_elantech.\n");
+               pr_debug("Probably not a real Elantech touchpad. Aborting.\n");
+               return -1;
        }
 
        if (set_properties) {