Skip to content

Commit

Permalink
Input: elantech - remove module parameter force_elantech
Browse files Browse the repository at this point in the history
This essentially reverts commit f81bc78.

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>
  • Loading branch information
JJ Ding authored and Dmitry Torokhov committed Sep 21, 2011
1 parent 84a90b6 commit 4af61e9
Showing 1 changed file with 2 additions and 10 deletions.
12 changes: 2 additions & 10 deletions drivers/input/mouse/elantech.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,6 @@
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
*/
Expand Down Expand Up @@ -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) {
Expand Down

0 comments on commit 4af61e9

Please sign in to comment.