Commit fcc48075 authored by Geoff Levand's avatar Geoff Levand Committed by Michael Ellerman

powerpc/ps3: Fix sys-manager-core sparse warnings

Fixes warnings like these:

  drivers/ps3/sys-manager-core.c: error: symbol 'ps3_sys_manager_power_off' redeclared with different type
Signed-off-by: default avatarGeoff Levand <geoff@infradead.org>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 6baa5ecd
...@@ -47,7 +47,7 @@ void ps3_sys_manager_register_ops(const struct ps3_sys_manager_ops *ops) ...@@ -47,7 +47,7 @@ void ps3_sys_manager_register_ops(const struct ps3_sys_manager_ops *ops)
} }
EXPORT_SYMBOL_GPL(ps3_sys_manager_register_ops); EXPORT_SYMBOL_GPL(ps3_sys_manager_register_ops);
void ps3_sys_manager_power_off(void) void __noreturn ps3_sys_manager_power_off(void)
{ {
if (ps3_sys_manager_ops.power_off) if (ps3_sys_manager_ops.power_off)
ps3_sys_manager_ops.power_off(ps3_sys_manager_ops.dev); ps3_sys_manager_ops.power_off(ps3_sys_manager_ops.dev);
...@@ -55,7 +55,7 @@ void ps3_sys_manager_power_off(void) ...@@ -55,7 +55,7 @@ void ps3_sys_manager_power_off(void)
ps3_sys_manager_halt(); ps3_sys_manager_halt();
} }
void ps3_sys_manager_restart(void) void __noreturn ps3_sys_manager_restart(void)
{ {
if (ps3_sys_manager_ops.restart) if (ps3_sys_manager_ops.restart)
ps3_sys_manager_ops.restart(ps3_sys_manager_ops.dev); ps3_sys_manager_ops.restart(ps3_sys_manager_ops.dev);
...@@ -63,7 +63,7 @@ void ps3_sys_manager_restart(void) ...@@ -63,7 +63,7 @@ void ps3_sys_manager_restart(void)
ps3_sys_manager_halt(); ps3_sys_manager_halt();
} }
void ps3_sys_manager_halt(void) void __noreturn ps3_sys_manager_halt(void)
{ {
pr_emerg("System Halted, OK to turn off power\n"); pr_emerg("System Halted, OK to turn off power\n");
local_irq_disable(); local_irq_disable();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment