diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-03-05 08:28:48 +0100 | 
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-03-05 09:23:12 +0100 | 
| commit | c281b94570ab711fdf21e81bdfb3d79764492bcf (patch) | |
| tree | 2316728b6d6312d7729a4335206d80a0d18a91a1 | |
| parent | e61980a70245715ab39cbee2b9d6e6afc1ec37d4 (diff) | |
init.h: Clean up the __setup()/early_param() macros
Make it all a bit easier on the eyes:
 - Move the __setup_param() lines right after their init functions
 - Use consistent vertical spacing
 - Use more horizontal spacing to make it look like regular C code
 - Use standard comment style
Cc: Luis R. Rodriguez <mcgrof@suse.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Borislav Petkov <bp@suse.de>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: David Vrabel <david.vrabel@citrix.com>
Cc: Dexuan Cui <decui@microsoft.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Jan Beulich <JBeulich@suse.com>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: Juergen Gross <jgross@suse.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Tony Lindgren <tony@atomide.com>
Cc: Toshi Kani <toshi.kani@hp.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Xishi Qiu <qiuxishi@huawei.com>
Cc: julia.lawall@lip6.fr
Signed-off-by: Ingo Molnar <mingo@kernel.org>
| -rw-r--r-- | include/linux/init.h | 49 | 
1 files changed, 27 insertions, 22 deletions
| diff --git a/include/linux/init.h b/include/linux/init.h index bc11ff96f336..21b6d768edd7 100644 --- a/include/linux/init.h +++ b/include/linux/init.h @@ -253,34 +253,39 @@ struct obs_kernel_param {   * obs_kernel_param "array" too far apart in .init.setup.   */  #define __setup_param(str, unique_id, fn, early)			\ -	static const char __setup_str_##unique_id[] __initconst	\ -		__aligned(1) = str; \ -	static struct obs_kernel_param __setup_##unique_id	\ -		__used __section(.init.setup)			\ -		__attribute__((aligned((sizeof(long)))))	\ +	static const char __setup_str_##unique_id[] __initconst		\ +		__aligned(1) = str; 					\ +	static struct obs_kernel_param __setup_##unique_id		\ +		__used __section(.init.setup)				\ +		__attribute__((aligned((sizeof(long)))))		\  		= { __setup_str_##unique_id, fn, early } -#define __setup(str, fn)					\ +#define __setup(str, fn)						\  	__setup_param(str, fn, fn, 0) -/* NOTE: fn is as per module_param, not __setup!  Emits warning if fn - * returns non-zero. */ -#define early_param(str, fn)					\ +/* + * NOTE: fn is as per module_param, not __setup! + * Emits warning if fn returns non-zero. + */ +#define early_param(str, fn)						\  	__setup_param(str, fn, fn, 1) -#define early_param_on_off(str_on, str_off, var, config)			\ -	int var = IS_ENABLED(config);				\ -	static int __init parse_##var##_on(char *arg)		\ -	{							\ -		var = 1;					\ -		return 0;					\ -	}							\ -	static int __init parse_##var##_off(char *arg)		\ -	{							\ -		var = 0;					\ -		return 0;					\ -	}							\ -	__setup_param(str_on, parse_##var##_on, parse_##var##_on, 1); \ +#define early_param_on_off(str_on, str_off, var, config)		\ +									\ +	int var = IS_ENABLED(config);					\ +									\ +	static int __init parse_##var##_on(char *arg)			\ +	{								\ +		var = 1;						\ +		return 0;						\ +	}								\ +	__setup_param(str_on, parse_##var##_on, parse_##var##_on, 1);	\ +									\ +	static int __init parse_##var##_off(char *arg)			\ +	{								\ +		var = 0;						\ +		return 0;						\ +	}								\  	__setup_param(str_off, parse_##var##_off, parse_##var##_off, 1)  /* Relies on boot_command_line being set */ | 
