diff options
| author |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-10-08 09:07:23 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-10-08 09:37:38 -0700 |
| commit | a2cb1191f4733134b21918b6098512a2e2e48e61 (patch) | |
| tree | a40cd0b338c11c6a9bebac215c8a1f0224ebe3a5 /drivers | |
| parent | Input: samsung-keypad - add clk_prepare and clk_unprepare (diff) | |
| download | linux-dev-a2cb1191f4733134b21918b6098512a2e2e48e61.tar.xz linux-dev-a2cb1191f4733134b21918b6098512a2e2e48e61.zip | |
Input: mousedev - factor out psaux code to reduce #ifdefery
Reviewed-by: David Herrmann <dh.herrmann@googlemail.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/input/mousedev.c | 47 |
1 files changed, 30 insertions, 17 deletions
diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c index 964e43d81e29..8d3942fe1c39 100644 --- a/drivers/input/mousedev.c +++ b/drivers/input/mousedev.c @@ -25,9 +25,6 @@ #include <linux/major.h> #include <linux/device.h> #include <linux/kernel.h> -#ifdef CONFIG_INPUT_MOUSEDEV_PSAUX -#include <linux/miscdevice.h> -#endif MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>"); MODULE_DESCRIPTION("Mouse (ExplorerPS/2) device interfaces"); @@ -1064,10 +1061,36 @@ static struct input_handler mousedev_handler = { }; #ifdef CONFIG_INPUT_MOUSEDEV_PSAUX +#include <linux/miscdevice.h> + static struct miscdevice psaux_mouse = { - PSMOUSE_MINOR, "psaux", &mousedev_fops + .minor = PSMOUSE_MINOR, + .name = "psaux", + .fops = &mousedev_fops, }; -static int psaux_registered; + +static bool psaux_registered; + +static void __init mousedev_psaux_register(void) +{ + int error; + + error = misc_register(&psaux_mouse); + if (error) + pr_warn("could not register psaux device, error: %d\n", + error); + else + psaux_registered = true; +} + +static void __exit mousedev_psaux_unregister(void) +{ + if (psaux_registered) + misc_deregister(&psaux_mouse); +} +#else +static inline void mousedev_psaux_register(void) { } +static inline void mousedev_psaux_unregister(void) { } #endif static int __init mousedev_init(void) @@ -1084,14 +1107,7 @@ static int __init mousedev_init(void) return error; } -#ifdef CONFIG_INPUT_MOUSEDEV_PSAUX - error = misc_register(&psaux_mouse); - if (error) - pr_warn("could not register psaux device, error: %d\n", - error); - else - psaux_registered = 1; -#endif + mousedev_psaux_register(); pr_info("PS/2 mouse device common for all mice\n"); @@ -1100,10 +1116,7 @@ static int __init mousedev_init(void) static void __exit mousedev_exit(void) { -#ifdef CONFIG_INPUT_MOUSEDEV_PSAUX - if (psaux_registered) - misc_deregister(&psaux_mouse); -#endif + mousedev_psaux_unregister(); input_unregister_handler(&mousedev_handler); mousedev_destroy(mousedev_mix); } |