openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Geoff Levand <geoff@infradead.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
Geoff Levand 2015-01-13 01:00:20 +00:00 committed by Michael Ellerman
parent 6baa5ecd6e
commit fcc480759a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/ps3/sys-manager-core.c
View File

@ -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)
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)
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();