From: Dmitry Osipenko <dmitry.osipenko@collabora.com>
Date: Mon, 9 May 2022 23:32:18 +0000 (+0300)
Subject: csky: Use do_kernel_power_off()
X-Git-Tag: v6.1-rc5~1209^2^2~2^2~17
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cf7e5bf0c68fa4a057ad3297ebdafa1189208236;p=platform%2Fkernel%2Flinux-starfive.git

csky: Use do_kernel_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 sys-off API.

Acked-by: Guo Ren <guoren@kernel.org>
Reviewed-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---

diff --git a/arch/csky/kernel/power.c b/arch/csky/kernel/power.c
index 923ee4e..86ee202 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");
 }