| Message ID | 1412100056-15517-15-git-send-email-linux@roeck-us.net (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Headers | show |
On 30/09/14 19:00, Guenter Roeck wrote: > The kernel core now supports a poweroff handler call chain > to remove power from the system. Call it if pm_power_off > is set to NULL. > > Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> > Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com> > Cc: Thomas Gleixner <tglx@linutronix.de> > Cc: Ingo Molnar <mingo@redhat.com> > Cc: H. Peter Anvin <hpa@zytor.com> > Signed-off-by: Guenter Roeck <linux@roeck-us.net> > --- > arch/x86/xen/enlighten.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c > index c0cb11f..645d00f 100644 > --- a/arch/x86/xen/enlighten.c > +++ b/arch/x86/xen/enlighten.c > @@ -1322,6 +1322,8 @@ static void xen_machine_power_off(void) > { > if (pm_power_off) > pm_power_off(); > + else > + do_kernel_poweroff(); Why isn't this if (pm_power_off) check in do_kernel_poweroff()? That way when you finally remove pm_power_off you need only update one place. A quick skim of the other archs suggest this would work for them too. David -- To unsubscribe from this list: send the line "unsubscribe linux-parisc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 10/02/2014 02:45 AM, David Vrabel wrote: > On 30/09/14 19:00, Guenter Roeck wrote: >> The kernel core now supports a poweroff handler call chain >> to remove power from the system. Call it if pm_power_off >> is set to NULL. >> >> Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> >> Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com> >> Cc: Thomas Gleixner <tglx@linutronix.de> >> Cc: Ingo Molnar <mingo@redhat.com> >> Cc: H. Peter Anvin <hpa@zytor.com> >> Signed-off-by: Guenter Roeck <linux@roeck-us.net> >> --- >> arch/x86/xen/enlighten.c | 2 ++ >> 1 file changed, 2 insertions(+) >> >> diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c >> index c0cb11f..645d00f 100644 >> --- a/arch/x86/xen/enlighten.c >> +++ b/arch/x86/xen/enlighten.c >> @@ -1322,6 +1322,8 @@ static void xen_machine_power_off(void) >> { >> if (pm_power_off) >> pm_power_off(); >> + else >> + do_kernel_poweroff(); > > Why isn't this if (pm_power_off) check in do_kernel_poweroff()? > > That way when you finally remove pm_power_off you need only update one > place. A quick skim of the other archs suggest this would work for them > too. > Good idea. I'll do that for the next version of the patch set. Guenter -- To unsubscribe from this list: send the line "unsubscribe linux-parisc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index c0cb11f..645d00f 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -1322,6 +1322,8 @@ static void xen_machine_power_off(void) { if (pm_power_off) pm_power_off(); + else + do_kernel_poweroff(); xen_reboot(SHUTDOWN_poweroff); }
The kernel core now supports a poweroff handler call chain to remove power from the system. Call it if pm_power_off is set to NULL. Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@redhat.com> Cc: H. Peter Anvin <hpa@zytor.com> Signed-off-by: Guenter Roeck <linux@roeck-us.net> --- arch/x86/xen/enlighten.c | 2 ++ 1 file changed, 2 insertions(+)