Skip to content

Commit 990cd3e

Browse files
glneoarndb
authored andcommitted
ARM: Switch to new sys-off handler API
Kernel now supports chained power-off handlers. Use register_platform_power_off() that registers a platform level power-off handler. Legacy pm_power_off() will be removed once all drivers and archs are converted to the new sys-off API. Signed-off-by: Andrew Davis <[email protected]> Reviewed-by: Andre Przywara <[email protected]> Acked-by: Alexey Charkov <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
1 parent 86731a2 commit 990cd3e

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

arch/arm/mach-highbank/highbank.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ static void __init highbank_init(void)
143143
sregs_base = of_iomap(np, 0);
144144
WARN_ON(!sregs_base);
145145

146-
pm_power_off = highbank_power_off;
146+
register_platform_power_off(highbank_power_off);
147147
highbank_pm_init();
148148

149149
bus_register_notifier(&platform_bus_type, &highbank_platform_nb);

arch/arm/mach-pxa/spitz.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1096,7 +1096,7 @@ static void __init spitz_init(void)
10961096
software_node_register(&spitz_scoop_2_gpiochip_node);
10971097

10981098
init_gpio_reset(SPITZ_GPIO_ON_RESET, 1, 0);
1099-
pm_power_off = spitz_poweroff;
1099+
register_platform_power_off(spitz_poweroff);
11001100

11011101
PMCR = 0x00;
11021102

arch/arm/mach-sa1100/generic.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ static struct platform_device *sa11x0_devices[] __initdata = {
298298
static int __init sa1100_init(void)
299299
{
300300
struct resource wdt_res = DEFINE_RES_MEM(0x90000000, 0x20);
301-
pm_power_off = sa1100_power_off;
301+
register_platform_power_off(sa1100_power_off);
302302

303303
regulator_has_full_constraints();
304304

arch/arm/mach-vt8500/vt8500.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ static void __init vt8500_init(void)
141141
pr_err("%s:ioremap(power_off) failed\n", __func__);
142142
}
143143
if (pmc_base)
144-
pm_power_off = &vt8500_power_off;
144+
register_platform_power_off(vt8500_power_off);
145145
else
146146
pr_err("%s: PMC Hibernation register could not be remapped, not enabling power off!\n", __func__);
147147
}

arch/arm/xen/enlighten.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -541,7 +541,7 @@ static int __init xen_late_init(void)
541541
if (!xen_domain())
542542
return -ENODEV;
543543

544-
pm_power_off = xen_power_off;
544+
register_platform_power_off(xen_power_off);
545545
register_restart_handler(&xen_restart_nb);
546546
if (!xen_initial_domain()) {
547547
struct timespec64 ts;

0 commit comments

Comments
 (0)