| Message ID | 20211027211715.12671-19-digetx@gmail.com (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Headers | show |
| Series | Introduce power-off+restart call chain API | expand |
On Wed, 27 Oct 2021 14:16:48 PDT (-0700), digetx@gmail.com wrote: > Kernel now supports chained power-off handlers. Use do_kernel_power_off() > that invokes chained power-off handlers. It also invokes legacy > pm_power_off() for now, which will be removed once all drivers will > be converted to the new power-off API. > > Signed-off-by: Dmitry Osipenko <digetx@gmail.com> > --- > arch/riscv/kernel/reset.c | 12 ++++-------- > 1 file changed, 4 insertions(+), 8 deletions(-) > > diff --git a/arch/riscv/kernel/reset.c b/arch/riscv/kernel/reset.c > index 9c842c41684a..912288572226 100644 > --- a/arch/riscv/kernel/reset.c > +++ b/arch/riscv/kernel/reset.c > @@ -23,16 +23,12 @@ void machine_restart(char *cmd) > > void machine_halt(void) > { > - if (pm_power_off != NULL) > - pm_power_off(); > - else > - default_power_off(); > + do_kernel_power_off(); > + default_power_off(); > } > > void machine_power_off(void) > { > - if (pm_power_off != NULL) > - pm_power_off(); > - else > - default_power_off(); > + do_kernel_power_off(); > + default_power_off(); > } Acked-by: Palmer Dabbelt <palmer@dabbelt.com>
diff --git a/arch/riscv/kernel/reset.c b/arch/riscv/kernel/reset.c index 9c842c41684a..912288572226 100644 --- a/arch/riscv/kernel/reset.c +++ b/arch/riscv/kernel/reset.c @@ -23,16 +23,12 @@ void machine_restart(char *cmd) void machine_halt(void) { - if (pm_power_off != NULL) - pm_power_off(); - else - default_power_off(); + do_kernel_power_off(); + default_power_off(); } void machine_power_off(void) { - if (pm_power_off != NULL) - pm_power_off(); - else - default_power_off(); + do_kernel_power_off(); + default_power_off(); }
Kernel now supports chained power-off handlers. Use do_kernel_power_off() that invokes chained power-off handlers. It also invokes legacy pm_power_off() for now, which will be removed once all drivers will be converted to the new power-off API. Signed-off-by: Dmitry Osipenko <digetx@gmail.com> --- arch/riscv/kernel/reset.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)