diff options
author | Rusty Russell <rusty@rustcorp.com.au> | 2012-01-12 18:02:20 -0500 |
---|---|---|
committer | Rusty Russell <rusty@rustcorp.com.au> | 2012-01-12 18:02:20 -0500 |
commit | 90ab5ee94171b3e28de6bb42ee30b527014e0be7 (patch) | |
tree | fcf89889f6e881f2b231d3d20287c08174ce4b54 /drivers/input | |
parent | 476bc0015bf09dad39d36a8b19f76f0c181d1ec9 (diff) |
module_param: make bool parameters really bool (drivers & misc)
module_param(bool) used to counter-intuitively take an int. In
fddd5201 (mid-2009) we allowed bool or int/unsigned int using a messy
trick.
It's time to remove the int/unsigned int option. For this version
it'll simply give a warning, but it'll break next kernel version.
Acked-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'drivers/input')
-rw-r--r-- | drivers/input/joystick/xpad.c | 6 | ||||
-rw-r--r-- | drivers/input/misc/wistron_btns.c | 2 | ||||
-rw-r--r-- | drivers/input/mouse/psmouse-base.c | 2 | ||||
-rw-r--r-- | drivers/input/mouse/synaptics_i2c.c | 6 | ||||
-rw-r--r-- | drivers/input/serio/hp_sdc.c | 2 | ||||
-rw-r--r-- | drivers/input/touchscreen/eeti_ts.c | 4 | ||||
-rw-r--r-- | drivers/input/touchscreen/htcpen.c | 4 | ||||
-rw-r--r-- | drivers/input/touchscreen/ucb1400_ts.c | 2 | ||||
-rw-r--r-- | drivers/input/touchscreen/usbtouchscreen.c | 4 |
9 files changed, 16 insertions, 16 deletions
diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c index 32bbd4c77b7c..fd7a0d5bc94d 100644 --- a/drivers/input/joystick/xpad.c +++ b/drivers/input/joystick/xpad.c | |||
@@ -98,15 +98,15 @@ | |||
98 | #define XTYPE_XBOX360W 2 | 98 | #define XTYPE_XBOX360W 2 |
99 | #define XTYPE_UNKNOWN 3 | 99 | #define XTYPE_UNKNOWN 3 |
100 | 100 | ||
101 | static int dpad_to_buttons; | 101 | static bool dpad_to_buttons; |
102 | module_param(dpad_to_buttons, bool, S_IRUGO); | 102 | module_param(dpad_to_buttons, bool, S_IRUGO); |
103 | MODULE_PARM_DESC(dpad_to_buttons, "Map D-PAD to buttons rather than axes for unknown pads"); | 103 | MODULE_PARM_DESC(dpad_to_buttons, "Map D-PAD to buttons rather than axes for unknown pads"); |
104 | 104 | ||
105 | static int triggers_to_buttons; | 105 | static bool triggers_to_buttons; |
106 | module_param(triggers_to_buttons, bool, S_IRUGO); | 106 | module_param(triggers_to_buttons, bool, S_IRUGO); |
107 | MODULE_PARM_DESC(triggers_to_buttons, "Map triggers to buttons rather than axes for unknown pads"); | 107 | MODULE_PARM_DESC(triggers_to_buttons, "Map triggers to buttons rather than axes for unknown pads"); |
108 | 108 | ||
109 | static int sticks_to_null; | 109 | static bool sticks_to_null; |
110 | module_param(sticks_to_null, bool, S_IRUGO); | 110 | module_param(sticks_to_null, bool, S_IRUGO); |
111 | MODULE_PARM_DESC(sticks_to_null, "Do not map sticks at all for unknown pads"); | 111 | MODULE_PARM_DESC(sticks_to_null, "Do not map sticks at all for unknown pads"); |
112 | 112 | ||
diff --git a/drivers/input/misc/wistron_btns.c b/drivers/input/misc/wistron_btns.c index 52b419348983..e2bdfd4bea70 100644 --- a/drivers/input/misc/wistron_btns.c +++ b/drivers/input/misc/wistron_btns.c | |||
@@ -48,7 +48,7 @@ MODULE_DESCRIPTION("Wistron laptop button driver"); | |||
48 | MODULE_LICENSE("GPL v2"); | 48 | MODULE_LICENSE("GPL v2"); |
49 | MODULE_VERSION("0.3"); | 49 | MODULE_VERSION("0.3"); |
50 | 50 | ||
51 | static int force; /* = 0; */ | 51 | static bool force; /* = 0; */ |
52 | module_param(force, bool, 0); | 52 | module_param(force, bool, 0); |
53 | MODULE_PARM_DESC(force, "Load even if computer is not in database"); | 53 | MODULE_PARM_DESC(force, "Load even if computer is not in database"); |
54 | 54 | ||
diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c index de7e8bc17b1f..e6c9931f02c7 100644 --- a/drivers/input/mouse/psmouse-base.c +++ b/drivers/input/mouse/psmouse-base.c | |||
@@ -60,7 +60,7 @@ static unsigned int psmouse_rate = 100; | |||
60 | module_param_named(rate, psmouse_rate, uint, 0644); | 60 | module_param_named(rate, psmouse_rate, uint, 0644); |
61 | MODULE_PARM_DESC(rate, "Report rate, in reports per second."); | 61 | MODULE_PARM_DESC(rate, "Report rate, in reports per second."); |
62 | 62 | ||
63 | static unsigned int psmouse_smartscroll = 1; | 63 | static bool psmouse_smartscroll = 1; |
64 | module_param_named(smartscroll, psmouse_smartscroll, bool, 0644); | 64 | module_param_named(smartscroll, psmouse_smartscroll, bool, 0644); |
65 | MODULE_PARM_DESC(smartscroll, "Logitech Smartscroll autorepeat, 1 = enabled (default), 0 = disabled."); | 65 | MODULE_PARM_DESC(smartscroll, "Logitech Smartscroll autorepeat, 1 = enabled (default), 0 = disabled."); |
66 | 66 | ||
diff --git a/drivers/input/mouse/synaptics_i2c.c b/drivers/input/mouse/synaptics_i2c.c index 4b755cb5b38c..1c58aafa523f 100644 --- a/drivers/input/mouse/synaptics_i2c.c +++ b/drivers/input/mouse/synaptics_i2c.c | |||
@@ -185,17 +185,17 @@ | |||
185 | #define NO_DATA_SLEEP_MSECS (MSEC_PER_SEC / 4) | 185 | #define NO_DATA_SLEEP_MSECS (MSEC_PER_SEC / 4) |
186 | 186 | ||
187 | /* Control touchpad's No Deceleration option */ | 187 | /* Control touchpad's No Deceleration option */ |
188 | static int no_decel = 1; | 188 | static bool no_decel = 1; |
189 | module_param(no_decel, bool, 0644); | 189 | module_param(no_decel, bool, 0644); |
190 | MODULE_PARM_DESC(no_decel, "No Deceleration. Default = 1 (on)"); | 190 | MODULE_PARM_DESC(no_decel, "No Deceleration. Default = 1 (on)"); |
191 | 191 | ||
192 | /* Control touchpad's Reduced Reporting option */ | 192 | /* Control touchpad's Reduced Reporting option */ |
193 | static int reduce_report; | 193 | static bool reduce_report; |
194 | module_param(reduce_report, bool, 0644); | 194 | module_param(reduce_report, bool, 0644); |
195 | MODULE_PARM_DESC(reduce_report, "Reduced Reporting. Default = 0 (off)"); | 195 | MODULE_PARM_DESC(reduce_report, "Reduced Reporting. Default = 0 (off)"); |
196 | 196 | ||
197 | /* Control touchpad's No Filter option */ | 197 | /* Control touchpad's No Filter option */ |
198 | static int no_filter; | 198 | static bool no_filter; |
199 | module_param(no_filter, bool, 0644); | 199 | module_param(no_filter, bool, 0644); |
200 | MODULE_PARM_DESC(no_filter, "No Filter. Default = 0 (off)"); | 200 | MODULE_PARM_DESC(no_filter, "No Filter. Default = 0 (off)"); |
201 | 201 | ||
diff --git a/drivers/input/serio/hp_sdc.c b/drivers/input/serio/hp_sdc.c index 979c443bf1ef..be3316073ae7 100644 --- a/drivers/input/serio/hp_sdc.c +++ b/drivers/input/serio/hp_sdc.c | |||
@@ -105,7 +105,7 @@ EXPORT_SYMBOL(__hp_sdc_enqueue_transaction); | |||
105 | EXPORT_SYMBOL(hp_sdc_enqueue_transaction); | 105 | EXPORT_SYMBOL(hp_sdc_enqueue_transaction); |
106 | EXPORT_SYMBOL(hp_sdc_dequeue_transaction); | 106 | EXPORT_SYMBOL(hp_sdc_dequeue_transaction); |
107 | 107 | ||
108 | static unsigned int hp_sdc_disabled; | 108 | static bool hp_sdc_disabled; |
109 | module_param_named(no_hpsdc, hp_sdc_disabled, bool, 0); | 109 | module_param_named(no_hpsdc, hp_sdc_disabled, bool, 0); |
110 | MODULE_PARM_DESC(no_hpsdc, "Do not enable HP SDC driver."); | 110 | MODULE_PARM_DESC(no_hpsdc, "Do not enable HP SDC driver."); |
111 | 111 | ||
diff --git a/drivers/input/touchscreen/eeti_ts.c b/drivers/input/touchscreen/eeti_ts.c index 7f8f538a9806..1df19bb8534a 100644 --- a/drivers/input/touchscreen/eeti_ts.c +++ b/drivers/input/touchscreen/eeti_ts.c | |||
@@ -35,11 +35,11 @@ | |||
35 | #include <linux/input/eeti_ts.h> | 35 | #include <linux/input/eeti_ts.h> |
36 | #include <linux/slab.h> | 36 | #include <linux/slab.h> |
37 | 37 | ||
38 | static int flip_x; | 38 | static bool flip_x; |
39 | module_param(flip_x, bool, 0644); | 39 | module_param(flip_x, bool, 0644); |
40 | MODULE_PARM_DESC(flip_x, "flip x coordinate"); | 40 | MODULE_PARM_DESC(flip_x, "flip x coordinate"); |
41 | 41 | ||
42 | static int flip_y; | 42 | static bool flip_y; |
43 | module_param(flip_y, bool, 0644); | 43 | module_param(flip_y, bool, 0644); |
44 | MODULE_PARM_DESC(flip_y, "flip y coordinate"); | 44 | MODULE_PARM_DESC(flip_y, "flip y coordinate"); |
45 | 45 | ||
diff --git a/drivers/input/touchscreen/htcpen.c b/drivers/input/touchscreen/htcpen.c index 81e338623944..d13143b68b3e 100644 --- a/drivers/input/touchscreen/htcpen.c +++ b/drivers/input/touchscreen/htcpen.c | |||
@@ -40,10 +40,10 @@ MODULE_LICENSE("GPL"); | |||
40 | #define X_AXIS_MAX 2040 | 40 | #define X_AXIS_MAX 2040 |
41 | #define Y_AXIS_MAX 2040 | 41 | #define Y_AXIS_MAX 2040 |
42 | 42 | ||
43 | static int invert_x; | 43 | static bool invert_x; |
44 | module_param(invert_x, bool, 0644); | 44 | module_param(invert_x, bool, 0644); |
45 | MODULE_PARM_DESC(invert_x, "If set, X axis is inverted"); | 45 | MODULE_PARM_DESC(invert_x, "If set, X axis is inverted"); |
46 | static int invert_y; | 46 | static bool invert_y; |
47 | module_param(invert_y, bool, 0644); | 47 | module_param(invert_y, bool, 0644); |
48 | MODULE_PARM_DESC(invert_y, "If set, Y axis is inverted"); | 48 | MODULE_PARM_DESC(invert_y, "If set, Y axis is inverted"); |
49 | 49 | ||
diff --git a/drivers/input/touchscreen/ucb1400_ts.c b/drivers/input/touchscreen/ucb1400_ts.c index d2b57536feea..46e83ad53f43 100644 --- a/drivers/input/touchscreen/ucb1400_ts.c +++ b/drivers/input/touchscreen/ucb1400_ts.c | |||
@@ -30,7 +30,7 @@ | |||
30 | 30 | ||
31 | #define UCB1400_TS_POLL_PERIOD 10 /* ms */ | 31 | #define UCB1400_TS_POLL_PERIOD 10 /* ms */ |
32 | 32 | ||
33 | static int adcsync; | 33 | static bool adcsync; |
34 | static int ts_delay = 55; /* us */ | 34 | static int ts_delay = 55; /* us */ |
35 | static int ts_delay_pressure; /* us */ | 35 | static int ts_delay_pressure; /* us */ |
36 | 36 | ||
diff --git a/drivers/input/touchscreen/usbtouchscreen.c b/drivers/input/touchscreen/usbtouchscreen.c index 06cef3ccc63a..3a5ebf452e81 100644 --- a/drivers/input/touchscreen/usbtouchscreen.c +++ b/drivers/input/touchscreen/usbtouchscreen.c | |||
@@ -60,11 +60,11 @@ | |||
60 | #define DRIVER_AUTHOR "Daniel Ritz <daniel.ritz@gmx.ch>" | 60 | #define DRIVER_AUTHOR "Daniel Ritz <daniel.ritz@gmx.ch>" |
61 | #define DRIVER_DESC "USB Touchscreen Driver" | 61 | #define DRIVER_DESC "USB Touchscreen Driver" |
62 | 62 | ||
63 | static int swap_xy; | 63 | static bool swap_xy; |
64 | module_param(swap_xy, bool, 0644); | 64 | module_param(swap_xy, bool, 0644); |
65 | MODULE_PARM_DESC(swap_xy, "If set X and Y axes are swapped."); | 65 | MODULE_PARM_DESC(swap_xy, "If set X and Y axes are swapped."); |
66 | 66 | ||
67 | static int hwcalib_xy; | 67 | static bool hwcalib_xy; |
68 | module_param(hwcalib_xy, bool, 0644); | 68 | module_param(hwcalib_xy, bool, 0644); |
69 | MODULE_PARM_DESC(hwcalib_xy, "If set hw-calibrated X/Y are used if available"); | 69 | MODULE_PARM_DESC(hwcalib_xy, "If set hw-calibrated X/Y are used if available"); |
70 | 70 | ||