| Message ID | 20211027211715.12671-13-digetx@gmail.com (mailing list archive) |
|---|---|
| State | Changes Requested, archived |
| Headers | show |
| Series | Introduce power-off+restart call chain API | expand |
Only for this patch, Acked-by: Guo Ren <guoren@kernel.org> On Thu, Oct 28, 2021 at 5:18 AM Dmitry Osipenko <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/csky/kernel/power.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/arch/csky/kernel/power.c b/arch/csky/kernel/power.c > index 923ee4e381b8..86ee202906f8 100644 > --- a/arch/csky/kernel/power.c > +++ b/arch/csky/kernel/power.c > @@ -9,16 +9,14 @@ EXPORT_SYMBOL(pm_power_off); > void machine_power_off(void) > { > local_irq_disable(); > - if (pm_power_off) > - pm_power_off(); > + do_kernel_power_off(); > asm volatile ("bkpt"); > } > > void machine_halt(void) > { > local_irq_disable(); > - if (pm_power_off) > - pm_power_off(); > + do_kernel_power_off(); > asm volatile ("bkpt"); > } > > -- > 2.33.1 >
diff --git a/arch/csky/kernel/power.c b/arch/csky/kernel/power.c index 923ee4e381b8..86ee202906f8 100644 --- a/arch/csky/kernel/power.c +++ b/arch/csky/kernel/power.c @@ -9,16 +9,14 @@ EXPORT_SYMBOL(pm_power_off); void machine_power_off(void) { local_irq_disable(); - if (pm_power_off) - pm_power_off(); + do_kernel_power_off(); asm volatile ("bkpt"); } void machine_halt(void) { local_irq_disable(); - if (pm_power_off) - pm_power_off(); + do_kernel_power_off(); asm volatile ("bkpt"); }
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/csky/kernel/power.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)