diff options
author | Rusty Russell <rusty@rustcorp.com.au> | 2009-06-12 23:46:53 -0400 |
---|---|---|
committer | Rusty Russell <rusty@rustcorp.com.au> | 2009-06-12 08:16:56 -0400 |
commit | 9a71af2c3627b379b7c31917a7f6ee0d29bc559b (patch) | |
tree | c09049a6a4458be91844500d7d5034b63a1cdcc7 | |
parent | ab8e2eb722f1e5fcbd8181e3e9ef4e95c52124df (diff) |
module_param: invbool should take a 'bool', not an 'int'
It takes an 'int' for historical reasons, and there are only two
users: simply switch it over to bool.
The other user (uvesafb.c) will get a (harmless-on-x86) warning until
the next patch is applied.
Cc: Brad Douglas <brad@neruo.com>
Cc: Michal Januszewski <spock@gentoo.org>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
-rw-r--r-- | drivers/video/aty/aty128fb.c | 2 | ||||
-rw-r--r-- | include/linux/moduleparam.h | 2 | ||||
-rw-r--r-- | kernel/params.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/video/aty/aty128fb.c b/drivers/video/aty/aty128fb.c index 35e8eb02b9e9..e4e4d433b007 100644 --- a/drivers/video/aty/aty128fb.c +++ b/drivers/video/aty/aty128fb.c | |||
@@ -354,7 +354,7 @@ static int default_crt_on __devinitdata = 0; | |||
354 | static int default_lcd_on __devinitdata = 1; | 354 | static int default_lcd_on __devinitdata = 1; |
355 | 355 | ||
356 | #ifdef CONFIG_MTRR | 356 | #ifdef CONFIG_MTRR |
357 | static int mtrr = 1; | 357 | static bool mtrr = true; |
358 | #endif | 358 | #endif |
359 | 359 | ||
360 | #ifdef CONFIG_PMAC_BACKLIGHT | 360 | #ifdef CONFIG_PMAC_BACKLIGHT |
diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h index a4f0b931846c..9bbca8e8c19f 100644 --- a/include/linux/moduleparam.h +++ b/include/linux/moduleparam.h | |||
@@ -192,7 +192,7 @@ extern int param_get_bool(char *buffer, struct kernel_param *kp); | |||
192 | 192 | ||
193 | extern int param_set_invbool(const char *val, struct kernel_param *kp); | 193 | extern int param_set_invbool(const char *val, struct kernel_param *kp); |
194 | extern int param_get_invbool(char *buffer, struct kernel_param *kp); | 194 | extern int param_get_invbool(char *buffer, struct kernel_param *kp); |
195 | #define param_check_invbool(name, p) __param_check(name, p, int) | 195 | #define param_check_invbool(name, p) __param_check(name, p, bool) |
196 | 196 | ||
197 | /* Comma-separated array: *nump is set to number they actually specified. */ | 197 | /* Comma-separated array: *nump is set to number they actually specified. */ |
198 | #define module_param_array_named(name, array, type, nump, perm) \ | 198 | #define module_param_array_named(name, array, type, nump, perm) \ |
diff --git a/kernel/params.c b/kernel/params.c index de273ec85bd2..023abbf5f89f 100644 --- a/kernel/params.c +++ b/kernel/params.c | |||
@@ -272,13 +272,13 @@ int param_set_invbool(const char *val, struct kernel_param *kp) | |||
272 | dummy.arg = &boolval; | 272 | dummy.arg = &boolval; |
273 | ret = param_set_bool(val, &dummy); | 273 | ret = param_set_bool(val, &dummy); |
274 | if (ret == 0) | 274 | if (ret == 0) |
275 | *(int *)kp->arg = !boolval; | 275 | *(bool *)kp->arg = !boolval; |
276 | return ret; | 276 | return ret; |
277 | } | 277 | } |
278 | 278 | ||
279 | int param_get_invbool(char *buffer, struct kernel_param *kp) | 279 | int param_get_invbool(char *buffer, struct kernel_param *kp) |
280 | { | 280 | { |
281 | return sprintf(buffer, "%c", (*(int *)kp->arg) ? 'N' : 'Y'); | 281 | return sprintf(buffer, "%c", (*(bool *)kp->arg) ? 'N' : 'Y'); |
282 | } | 282 | } |
283 | 283 | ||
284 | /* We break the rule and mangle the string. */ | 284 | /* We break the rule and mangle the string. */ |