aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/mouse
diff options
context:
space:
mode:
authorJJ Ding <jj_ding@emc.com.tw>2011-09-21 01:42:51 -0400
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2011-09-21 01:46:28 -0400
commit4af61e90270e35bafa9e99a3c48fb3f363da592d (patch)
treee5a7de6e4ee4239c0d979ff6ec532c054955b58a /drivers/input/mouse
parent84a90b610a1473d732818ec5d041ab18eae77f14 (diff)
Input: elantech - remove module parameter force_elantech
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>
Diffstat (limited to 'drivers/input/mouse')
-rw-r--r--drivers/input/mouse/elantech.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c
index c2d91ebbadf4..25290b395c88 100644
--- a/drivers/input/mouse/elantech.c
+++ b/drivers/input/mouse/elantech.c
@@ -28,10 +28,6 @@
28 printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__); \ 28 printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__); \
29 } while (0) 29 } while (0)
30 30
31static bool force_elantech;
32module_param_named(force_elantech, force_elantech, bool, 0644);
33MODULE_PARM_DESC(force_elantech, "Force the Elantech PS/2 protocol extension to be used, 1 = enabled, 0 = disabled (default).");
34
35/* 31/*
36 * Send a Synaptics style sliced query command 32 * Send a Synaptics style sliced query command
37 */ 33 */
@@ -1164,12 +1160,8 @@ int elantech_detect(struct psmouse *psmouse, bool set_properties)
1164 param[0], param[1], param[2]); 1160 param[0], param[1], param[2]);
1165 1161
1166 if (!elantech_is_signature_valid(param)) { 1162 if (!elantech_is_signature_valid(param)) {
1167 if (!force_elantech) { 1163 pr_debug("Probably not a real Elantech touchpad. Aborting.\n");
1168 pr_debug("Probably not a real Elantech touchpad. Aborting.\n"); 1164 return -1;
1169 return -1;
1170 }
1171
1172 pr_debug("Probably not a real Elantech touchpad. Enabling anyway due to force_elantech.\n");
1173 } 1165 }
1174 1166
1175 if (set_properties) { 1167 if (set_properties) {