diff options
| author | Andrew Morton <akpm@osdl.org> | 2004-01-18 18:08:16 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.osdl.org> | 2004-01-18 18:08:16 -0800 |
| commit | a03c40a3c0bdecb6c18cf080922dc8c8a0e29bd5 (patch) | |
| tree | 00ce3573508e4cf753fe1ab4bda41586b0310c42 /drivers/input | |
| parent | 687e435aee8e38fdea38c0d8a9d299adb855c2b9 (diff) | |
[PATCH] input: psmouse option parsing
From: Dmitry Torokhov <dtor_core@ameritech.net>
With Vojtech's approval adjusted psmouse option names by dropping psmouse_
prefix.
If psmouse is compiled as a module new option names are: proto, rate,
resetafter, resolution, smartscroll
If psmouse is built in the kernel the prefix "psmouse." is required in
front of an option, like "psmouse.proto"
Also, since we are changing all names, killed psmouse_noext completely
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/mouse/psmouse-base.c | 30 |
1 files changed, 10 insertions, 20 deletions
diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c index 89e1c47a1b8a..fb7dde20cdcc 100644 --- a/drivers/input/mouse/psmouse-base.c +++ b/drivers/input/mouse/psmouse-base.c @@ -26,30 +26,26 @@ MODULE_AUTHOR("Vojtech Pavlik <vojtech@suse.cz>"); MODULE_DESCRIPTION("PS/2 mouse driver"); MODULE_LICENSE("GPL"); -static int psmouse_noext; -module_param(psmouse_noext, int, 0); -MODULE_PARM_DESC(psmouse_noext, "[DEPRECATED] Disable any protocol extensions. Useful for KVM switches."); - static char *psmouse_proto; static unsigned int psmouse_max_proto = -1U; -module_param(psmouse_proto, charp, 0); -MODULE_PARM_DESC(psmouse_proto, "Highest protocol extension to probe (bare, imps, exps). Useful for KVM switches."); +module_param_named(proto, psmouse_proto, charp, 0); +MODULE_PARM_DESC(proto, "Highest protocol extension to probe (bare, imps, exps). Useful for KVM switches."); int psmouse_resolution = 200; -module_param(psmouse_resolution, uint, 0); -MODULE_PARM_DESC(psmouse_resolution, "Resolution, in dpi."); +module_param_named(resolution, psmouse_resolution, uint, 0); +MODULE_PARM_DESC(resolution, "Resolution, in dpi."); unsigned int psmouse_rate = 100; -module_param(psmouse_rate, uint, 0); -MODULE_PARM_DESC(psmouse_rate, "Report rate, in reports per second."); +module_param_named(rate, psmouse_rate, uint, 0); +MODULE_PARM_DESC(rate, "Report rate, in reports per second."); int psmouse_smartscroll = 1; -module_param(psmouse_smartscroll, bool, 0); -MODULE_PARM_DESC(psmouse_smartscroll, "Logitech Smartscroll autorepeat, 1 = enabled (default), 0 = disabled."); +module_param_named(smartscroll, psmouse_smartscroll, bool, 0); +MODULE_PARM_DESC(smartscroll, "Logitech Smartscroll autorepeat, 1 = enabled (default), 0 = disabled."); unsigned int psmouse_resetafter; -module_param(psmouse_resetafter, uint, 0); -MODULE_PARM_DESC(psmouse_resetafter, "Reset Synaptics Touchpad after so many bad packets (0 = never)."); +module_param_named(resetafter, psmouse_resetafter, uint, 0); +MODULE_PARM_DESC(resetafter, "Reset Synaptics Touchpad after so many bad packets (0 = never)."); static char *psmouse_protocols[] = { "None", "PS/2", "PS2++", "PS2T++", "GenPS/2", "ImPS/2", "ImExPS/2", "SynPS/2"}; @@ -665,12 +661,6 @@ static struct serio_dev psmouse_dev = { static inline void psmouse_parse_proto(void) { - if (psmouse_noext) { - printk(KERN_WARNING "psmouse: 'psmouse_noext' option is deprecated, please use 'psmouse_proto'\n"); - psmouse_max_proto = PSMOUSE_PS2; - } - - /* even is psmouse_noext is present psmouse_proto overrides it */ if (psmouse_proto) { if (!strcmp(psmouse_proto, "bare")) psmouse_max_proto = PSMOUSE_PS2; |