Skip to content

Commit

Permalink
powerpc/ps3: Fix sys-manager-core sparse warnings
Browse files Browse the repository at this point in the history
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 <[email protected]>
Signed-off-by: Michael Ellerman <[email protected]>
  • Loading branch information
glevand authored and mpe committed Jan 22, 2015
1 parent 6baa5ec commit fcc4807
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/ps3/sys-manager-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -47,23 +47,23 @@ void ps3_sys_manager_register_ops(const struct ps3_sys_manager_ops *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)
ps3_sys_manager_ops.power_off(ps3_sys_manager_ops.dev);

ps3_sys_manager_halt();
}

void ps3_sys_manager_restart(void)
void __noreturn ps3_sys_manager_restart(void)
{
if (ps3_sys_manager_ops.restart)
ps3_sys_manager_ops.restart(ps3_sys_manager_ops.dev);

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");
local_irq_disable();
Expand Down

0 comments on commit fcc4807

Please sign in to comment.