Re: [PATCH -v5 4/5] checkpatch.pl the new kernel/reboot.c file.

[Robin Holt <holt@sgi.com>]

On Wed, Apr 17, 2013 at 01:43:17PM -0500, Robin Holt wrote:
> I did allow the remaining 81 character line behind.  It did not seem
> like it was worth changing.  Otherwise, it now passes checkpatch.pl.
> 
> Signed-off-by: Robin Holt <holt@sgi.com>
> To: Ingo Molnar <mingo@redhat.com>
> To: Russ Anderson <rja@sgi.com>
> Cc: Shawn Guo <shawn.guo@linaro.org>
> Cc: Oleg Nesterov <oleg@redhat.com>
> Cc: Andrew Morton <akpm@linux-foundation.org>
> Cc: "H. Peter Anvin" <hpa@zytor.com>
> Cc: Lai Jiangshan <laijs@cn.fujitsu.com>
> Cc: Linus Torvalds <torvalds@linux-foundation.org>
> Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
> Cc: Michel Lespinasse <walken@google.com>
> Cc: Oleg Nesterov <oleg@redhat.com>
> Cc: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
> Cc: Paul Mackerras <paulus@samba.org>
> Cc: Peter Zijlstra <peterz@infradead.org>
> Cc: Robin Holt <holt@sgi.com>
> Cc: "rusty@rustcorp.com.au" <rusty@rustcorp.com.au>
> Cc: Tejun Heo <tj@kernel.org>
> Cc: the arch/x86 maintainers <x86@kernel.org>
> Cc: Thomas Gleixner <tglx@linutronix.de>
> Cc: Joe Perches <joe@perches.com>
> 
> ---
> 
> Changes since -v3:
> Integrated feedback from Joe Perches.
> ---
>  kernel/reboot.c | 26 +++++++++++++-------------
>  1 file changed, 13 insertions(+), 13 deletions(-)
> 
> diff --git a/kernel/reboot.c b/kernel/reboot.c
> index ff92601..c4eb2a4 100644
> --- a/kernel/reboot.c
> +++ b/kernel/reboot.c
> @@ -4,6 +4,8 @@
>   *  Copyright (C) 2013  Linus Torvalds
>   */
>  
> +#define pr_fmt(fmt)	"reboot: " fmt
> +
>  #include <linux/export.h>
>  #include <linux/kexec.h>
>  #include <linux/kmod.h>
> @@ -99,9 +101,9 @@ void kernel_restart(char *cmd)
>  	migrate_to_reboot_cpu();
>  	syscore_shutdown();
>  	if (!cmd)
> -		printk(KERN_EMERG "Restarting system.\n");
> +		pr_emerg("Restarting system\n");
>  	else
> -		printk(KERN_EMERG "Restarting system with command '%s'.\n", cmd);
> +		pr_emerg("Restarting system with command '%s'\n", cmd);
>  	kmsg_dump(KMSG_DUMP_RESTART);
>  	machine_restart(cmd);
>  }
> @@ -110,7 +112,7 @@ EXPORT_SYMBOL_GPL(kernel_restart);
>  static void kernel_shutdown_prepare(enum system_states state)
>  {
>  	blocking_notifier_call_chain(&reboot_notifier_list,
> -		(state == SYSTEM_HALT)?SYS_HALT:SYS_POWER_OFF, NULL);
> +		(state == SYSTEM_HALT) ? SYS_HALT : SYS_POWER_OFF, NULL);
>  	system_state = state;
>  	usermodehelper_disable();
>  	device_shutdown();
> @@ -125,11 +127,10 @@ void kernel_halt(void)
>  	kernel_shutdown_prepare(SYSTEM_HALT);
>  	migrate_to_reboot_cpu();
>  	syscore_shutdown();
> -	printk(KERN_EMERG "System halted.\n");
> +	pr_emerg("System halted\n");
>  	kmsg_dump(KMSG_DUMP_HALT);
>  	machine_halt();
>  }
> -
>  EXPORT_SYMBOL_GPL(kernel_halt);
>  
>  /**
> @@ -144,7 +145,7 @@ void kernel_power_off(void)
>  		pm_power_off_prepare();
>  	migrate_to_reboot_cpu();
>  	syscore_shutdown();
> -	printk(KERN_EMERG "Power down.\n");
> +	pr_emerg("Power down\n");
>  	kmsg_dump(KMSG_DUMP_POWEROFF);
>  	machine_power_off();
>  }
> @@ -173,10 +174,10 @@ SYSCALL_DEFINE4(reboot, int, magic1, int, magic2, unsigned int, cmd,
>  
>  	/* For safety, we require "magic" arguments. */
>  	if (magic1 != LINUX_REBOOT_MAGIC1 ||
> -	    (magic2 != LINUX_REBOOT_MAGIC2 &&
> -	                magic2 != LINUX_REBOOT_MAGIC2A &&
> +			(magic2 != LINUX_REBOOT_MAGIC2 &&
> +			magic2 != LINUX_REBOOT_MAGIC2A &&
>  			magic2 != LINUX_REBOOT_MAGIC2B &&
> -	                magic2 != LINUX_REBOOT_MAGIC2C))
> +			magic2 != LINUX_REBOOT_MAGIC2C))
>  		return -EINVAL;
>  
>  	/*
> @@ -285,14 +286,13 @@ static int __orderly_poweroff(bool force)
>  		ret = call_usermodehelper(argv[0], argv, envp, UMH_WAIT_EXEC);
>  		argv_free(argv);
>  	} else {
> -		printk(KERN_WARNING "%s failed to allocate memory for \"%s\"\n",
> -					 __func__, poweroff_cmd);
> +		pr_warn("%s failed to allocate memory for \"%s\"\n",
> +						__func__, poweroff_cmd);

Argh.  I had intended to remove this.  I will fix up my workarea and be
ready to not miss it on the next pass.

Robin