Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a71af2c authored Jun 12, 2009 by Rusty Russell

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>

parent ab8e2eb7

drivers/video/aty/aty128fb.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -354,7 +354,7 @@ static int default_crt_on __devinitdata = 0;
	static int default_lcd_on __devinitdata = 1;		static int default_lcd_on __devinitdata = 1;

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

	#ifdef CONFIG_PMAC_BACKLIGHT		#ifdef CONFIG_PMAC_BACKLIGHT

include/linux/moduleparam.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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_set_invbool(const char val, struct kernel_param kp);
	extern int param_get_invbool(char buffer, 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. /		/* Comma-separated array: nump is set to number they actually specified. /
	#define module_param_array_named(name, array, type, nump, perm) \		#define module_param_array_named(name, array, type, nump, perm) \

kernel/params.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -272,13 +272,13 @@ int param_set_invbool(const char val, struct kernel_param kp)
	dummy.arg = &boolval;		dummy.arg = &boolval;
	ret = param_set_bool(val, &dummy);		ret = param_set_bool(val, &dummy);
	if (ret == 0)		if (ret == 0)
	(int )kp->arg = !boolval;		(bool )kp->arg = !boolval;
	return ret;		return ret;
	}		}

	int param_get_invbool(char buffer, struct kernel_param kp)		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. */		/* We break the rule and mangle the string. */