diff options
| author | Geoff Levand <geoff@infradead.org> | 2015-01-13 01:00:20 +0000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2015-01-22 17:31:21 +1100 |
| commit | fcc480759a91769e0a9a1086cb9cb4f618277d3d (patch) | |
| tree | 08bc6421875f5aeeea7c62cacd2d5ec78dfb66b5 /drivers/ps3 | |
| parent | 6baa5ecd6e9631a71423578a4a95dc8b179df386 (diff) | |
| download | talos-obmc-linux-fcc480759a91769e0a9a1086cb9cb4f618277d3d.tar.gz talos-obmc-linux-fcc480759a91769e0a9a1086cb9cb4f618277d3d.zip | |
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>
Diffstat (limited to 'drivers/ps3')
| -rw-r--r-- | drivers/ps3/sys-manager-core.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ps3/sys-manager-core.c b/drivers/ps3/sys-manager-core.c index 0e41737ea835..c429ffca1ab7 100644 --- a/drivers/ps3/sys-manager-core.c +++ b/drivers/ps3/sys-manager-core.c @@ -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); -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); @@ -55,7 +55,7 @@ void ps3_sys_manager_power_off(void) 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); @@ -63,7 +63,7 @@ void ps3_sys_manager_restart(void) 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(); |
