From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934807Ab3DOSkE (ORCPT ); Mon, 15 Apr 2013 14:40:04 -0400 Received: from relay1.sgi.com ([192.48.179.29]:47613 "EHLO relay.sgi.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754678Ab3DOSkB (ORCPT ); Mon, 15 Apr 2013 14:40:01 -0400 Date: Mon, 15 Apr 2013 13:39:59 -0500 From: Robin Holt To: Joe Perches Cc: Robin Holt , Ingo Molnar , Russ Anderson , Shawn Guo , Oleg Nesterov , Andrew Morton , "H. Peter Anvin" , Lai Jiangshan , Linus Torvalds , Linux Kernel Mailing List , Michel Lespinasse , "Paul E. McKenney" , Paul Mackerras , Peter Zijlstra , "rusty@rustcorp.com.au" , Tejun Heo , the arch/x86 maintainers , Thomas Gleixner Subject: Re: [Patch -v3 3/4] checkpatch.pl the new kernel/reboot.c file. Message-ID: <20130415183959.GF3658@sgi.com> References: <20130415171225.GC3658@sgi.com> <20130415171603.GH3672@sgi.com> <1366047938.31131.6.camel@joe-AO722> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1366047938.31131.6.camel@joe-AO722> User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Apr 15, 2013 at 10:45:38AM -0700, Joe Perches wrote: > On Mon, 2013-04-15 at 12:16 -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. > > trivia: > > I'd make these changes on top of your patch: > > o Additional OOM messages aren't necessary as a dump_stack is done > o Add pr_fmt to prefix logging messages with "reboot: " > o Remove periods from logging messages > o Argument alignment > o Rename file prefix to "reboot.c" > o Add #include so it compiles I added linux/suspend.h and also turned on HIBERNATE in my .config file. Robin > > --- > kernel/reboot.c | 26 ++++++++++++++------------ > 1 file changed, 14 insertions(+), 12 deletions(-) > > diff --git a/kernel/reboot.c b/kernel/reboot.c > index 187a0d8..7adba53 100644 > --- a/kernel/reboot.c > +++ b/kernel/reboot.c > @@ -1,14 +1,17 @@ > /* > - * linux/kernel/sys.c > + * linux/kernel/reboot.c > * > * Copyright (C) 2013 Linus Torvalds > */ > > +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt > + > #include > #include > #include > #include > #include > +#include > #include > #include > > @@ -96,9 +99,9 @@ void kernel_restart(char *cmd) > migrate_to_reboot_cpu(); > syscore_shutdown(); > if (!cmd) > - pr_emerg("Restarting system.\n"); > + pr_emerg("Restarting system\n"); > else > - pr_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); > } > @@ -107,7 +110,8 @@ 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(); > @@ -122,7 +126,7 @@ void kernel_halt(void) > kernel_shutdown_prepare(SYSTEM_HALT); > migrate_to_reboot_cpu(); > syscore_shutdown(); > - pr_emerg("System halted.\n"); > + pr_emerg("System halted\n"); > kmsg_dump(KMSG_DUMP_HALT); > machine_halt(); > } > @@ -140,7 +144,7 @@ void kernel_power_off(void) > pm_power_off_prepare(); > migrate_to_reboot_cpu(); > syscore_shutdown(); > - pr_emerg("Power down.\n"); > + pr_emerg("Power down\n"); > kmsg_dump(KMSG_DUMP_POWEROFF); > machine_power_off(); > } > @@ -169,10 +173,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_MAGIC2B && > - magic2 != LINUX_REBOOT_MAGIC2C)) > + (magic2 != LINUX_REBOOT_MAGIC2 && > + magic2 != LINUX_REBOOT_MAGIC2A && > + magic2 != LINUX_REBOOT_MAGIC2B && > + magic2 != LINUX_REBOOT_MAGIC2C)) > return -EINVAL; > > /* > @@ -281,8 +285,6 @@ static int __orderly_poweroff(bool force) > ret = call_usermodehelper(argv[0], argv, envp, UMH_WAIT_EXEC); > argv_free(argv); > } else { > - pr_warn("%s failed to allocate memory for \"%s\"\n", > - __func__, poweroff_cmd); > ret = -ENOMEM; > } > >