Skip to content

Commit

Permalink
module_param: invbool should take a 'bool', not an 'int'
Browse files Browse the repository at this point in the history
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 <[email protected]>
Cc: Michal Januszewski <[email protected]>
Signed-off-by: Rusty Russell <[email protected]>
rustyrussell committed Jun 12, 2009
1 parent ab8e2eb commit 9a71af2
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion drivers/video/aty/aty128fb.c
Original file line number Diff line number Diff line change
@@ -354,7 +354,7 @@ static int default_crt_on __devinitdata = 0;
static int default_lcd_on __devinitdata = 1;

#ifdef CONFIG_MTRR
static int mtrr = 1;
static bool mtrr = true;
#endif

#ifdef CONFIG_PMAC_BACKLIGHT
2 changes: 1 addition & 1 deletion include/linux/moduleparam.h
Original file line number Diff line number Diff line change
@@ -192,7 +192,7 @@ extern int param_get_bool(char *buffer, struct kernel_param *kp);

extern int param_set_invbool(const char *val, struct kernel_param *kp);
extern int param_get_invbool(char *buffer, struct kernel_param *kp);
#define param_check_invbool(name, p) __param_check(name, p, int)
#define param_check_invbool(name, p) __param_check(name, p, bool)

/* Comma-separated array: *nump is set to number they actually specified. */
#define module_param_array_named(name, array, type, nump, perm) \
4 changes: 2 additions & 2 deletions kernel/params.c
Original file line number Diff line number Diff line change
@@ -272,13 +272,13 @@ int param_set_invbool(const char *val, struct kernel_param *kp)
dummy.arg = &boolval;
ret = param_set_bool(val, &dummy);
if (ret == 0)
*(int *)kp->arg = !boolval;
*(bool *)kp->arg = !boolval;
return ret;
}

int param_get_invbool(char *buffer, struct kernel_param *kp)
{
return sprintf(buffer, "%c", (*(int *)kp->arg) ? 'N' : 'Y');
return sprintf(buffer, "%c", (*(bool *)kp->arg) ? 'N' : 'Y');
}

/* We break the rule and mangle the string. */

0 comments on commit 9a71af2

Please sign in to comment.