diff options
author | Dmitry Torokhov <dtor@insightbb.com> | 2007-02-18 01:44:58 -0500 |
---|---|---|
committer | Dmitry Torokhov <dtor@insightbb.com> | 2007-02-18 01:44:58 -0500 |
commit | 62b529a7b9c11880a8820494a25db0e2ecdf3bed (patch) | |
tree | a0beb325472c8ea07579c46e6cccb2f9e8f41b9d /drivers/input/joystick | |
parent | 2a575f11fb8e13d6bbdefaa591e9406200674402 (diff) |
Input: remove obsolete setup parameters from input drivers
They have been marked as __obsolete_setup() for several years,
it is time for them to go.
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input/joystick')
-rw-r--r-- | drivers/input/joystick/amijoy.c | 2 | ||||
-rw-r--r-- | drivers/input/joystick/analog.c | 2 | ||||
-rw-r--r-- | drivers/input/joystick/db9.c | 4 | ||||
-rw-r--r-- | drivers/input/joystick/gamecon.c | 6 | ||||
-rw-r--r-- | drivers/input/joystick/turbografx.c | 4 |
5 files changed, 0 insertions, 18 deletions
diff --git a/drivers/input/joystick/amijoy.c b/drivers/input/joystick/amijoy.c index e608691b5a61..b0f5541ec3e6 100644 --- a/drivers/input/joystick/amijoy.c +++ b/drivers/input/joystick/amijoy.c | |||
@@ -50,8 +50,6 @@ static int amijoy[2] = { 0, 1 }; | |||
50 | module_param_array_named(map, amijoy, uint, NULL, 0); | 50 | module_param_array_named(map, amijoy, uint, NULL, 0); |
51 | MODULE_PARM_DESC(map, "Map of attached joysticks in form of <a>,<b> (default is 0,1)"); | 51 | MODULE_PARM_DESC(map, "Map of attached joysticks in form of <a>,<b> (default is 0,1)"); |
52 | 52 | ||
53 | __obsolete_setup("amijoy="); | ||
54 | |||
55 | static int amijoy_used; | 53 | static int amijoy_used; |
56 | static DEFINE_MUTEX(amijoy_mutex); | 54 | static DEFINE_MUTEX(amijoy_mutex); |
57 | static struct input_dev *amijoy_dev[2]; | 55 | static struct input_dev *amijoy_dev[2]; |
diff --git a/drivers/input/joystick/analog.c b/drivers/input/joystick/analog.c index 7ef68456d7d6..51f1e4bfff3e 100644 --- a/drivers/input/joystick/analog.c +++ b/drivers/input/joystick/analog.c | |||
@@ -58,8 +58,6 @@ static int analog_options[ANALOG_PORTS]; | |||
58 | module_param_array_named(map, js, charp, &js_nargs, 0); | 58 | module_param_array_named(map, js, charp, &js_nargs, 0); |
59 | MODULE_PARM_DESC(map, "Describes analog joysticks type/capabilities"); | 59 | MODULE_PARM_DESC(map, "Describes analog joysticks type/capabilities"); |
60 | 60 | ||
61 | __obsolete_setup("js="); | ||
62 | |||
63 | /* | 61 | /* |
64 | * Times, feature definitions. | 62 | * Times, feature definitions. |
65 | */ | 63 | */ |
diff --git a/drivers/input/joystick/db9.c b/drivers/input/joystick/db9.c index 5080e15c6d30..b41bd2eb37dd 100644 --- a/drivers/input/joystick/db9.c +++ b/drivers/input/joystick/db9.c | |||
@@ -59,10 +59,6 @@ MODULE_PARM_DESC(dev2, "Describes second attached device (<parport#>,<type>)"); | |||
59 | module_param_array_named(dev3, db9[2].args, int, &db9[2].nargs, 0); | 59 | module_param_array_named(dev3, db9[2].args, int, &db9[2].nargs, 0); |
60 | MODULE_PARM_DESC(dev3, "Describes third attached device (<parport#>,<type>)"); | 60 | MODULE_PARM_DESC(dev3, "Describes third attached device (<parport#>,<type>)"); |
61 | 61 | ||
62 | __obsolete_setup("db9="); | ||
63 | __obsolete_setup("db9_2="); | ||
64 | __obsolete_setup("db9_3="); | ||
65 | |||
66 | #define DB9_ARG_PARPORT 0 | 62 | #define DB9_ARG_PARPORT 0 |
67 | #define DB9_ARG_MODE 1 | 63 | #define DB9_ARG_MODE 1 |
68 | 64 | ||
diff --git a/drivers/input/joystick/gamecon.c b/drivers/input/joystick/gamecon.c index fe12aa37393d..711e4b3e9e61 100644 --- a/drivers/input/joystick/gamecon.c +++ b/drivers/input/joystick/gamecon.c | |||
@@ -60,10 +60,6 @@ MODULE_PARM_DESC(map2, "Describes second set of devices"); | |||
60 | module_param_array_named(map3, gc[2].args, int, &gc[2].nargs, 0); | 60 | module_param_array_named(map3, gc[2].args, int, &gc[2].nargs, 0); |
61 | MODULE_PARM_DESC(map3, "Describes third set of devices"); | 61 | MODULE_PARM_DESC(map3, "Describes third set of devices"); |
62 | 62 | ||
63 | __obsolete_setup("gc="); | ||
64 | __obsolete_setup("gc_2="); | ||
65 | __obsolete_setup("gc_3="); | ||
66 | |||
67 | /* see also gs_psx_delay parameter in PSX support section */ | 63 | /* see also gs_psx_delay parameter in PSX support section */ |
68 | 64 | ||
69 | #define GC_SNES 1 | 65 | #define GC_SNES 1 |
@@ -403,8 +399,6 @@ static int gc_psx_delay = GC_PSX_DELAY; | |||
403 | module_param_named(psx_delay, gc_psx_delay, uint, 0); | 399 | module_param_named(psx_delay, gc_psx_delay, uint, 0); |
404 | MODULE_PARM_DESC(psx_delay, "Delay when accessing Sony PSX controller (usecs)"); | 400 | MODULE_PARM_DESC(psx_delay, "Delay when accessing Sony PSX controller (usecs)"); |
405 | 401 | ||
406 | __obsolete_setup("gc_psx_delay="); | ||
407 | |||
408 | static short gc_psx_abs[] = { ABS_X, ABS_Y, ABS_RX, ABS_RY, ABS_HAT0X, ABS_HAT0Y }; | 402 | static short gc_psx_abs[] = { ABS_X, ABS_Y, ABS_RX, ABS_RY, ABS_HAT0X, ABS_HAT0Y }; |
409 | static short gc_psx_btn[] = { BTN_TL, BTN_TR, BTN_TL2, BTN_TR2, BTN_A, BTN_B, BTN_X, BTN_Y, | 403 | static short gc_psx_btn[] = { BTN_TL, BTN_TR, BTN_TL2, BTN_TR2, BTN_A, BTN_B, BTN_X, BTN_Y, |
410 | BTN_START, BTN_SELECT, BTN_THUMBL, BTN_THUMBR }; | 404 | BTN_START, BTN_SELECT, BTN_THUMBL, BTN_THUMBR }; |
diff --git a/drivers/input/joystick/turbografx.c b/drivers/input/joystick/turbografx.c index 5570fd5487c7..037d3487fcc7 100644 --- a/drivers/input/joystick/turbografx.c +++ b/drivers/input/joystick/turbografx.c | |||
@@ -60,10 +60,6 @@ MODULE_PARM_DESC(map2, "Describes second set of devices"); | |||
60 | module_param_array_named(map3, tgfx[2].args, int, &tgfx[2].nargs, 0); | 60 | module_param_array_named(map3, tgfx[2].args, int, &tgfx[2].nargs, 0); |
61 | MODULE_PARM_DESC(map3, "Describes third set of devices"); | 61 | MODULE_PARM_DESC(map3, "Describes third set of devices"); |
62 | 62 | ||
63 | __obsolete_setup("tgfx="); | ||
64 | __obsolete_setup("tgfx_2="); | ||
65 | __obsolete_setup("tgfx_3="); | ||
66 | |||
67 | #define TGFX_REFRESH_TIME HZ/100 /* 10 ms */ | 63 | #define TGFX_REFRESH_TIME HZ/100 /* 10 ms */ |
68 | 64 | ||
69 | #define TGFX_TRIGGER 0x08 | 65 | #define TGFX_TRIGGER 0x08 |