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

glevand · mpe · commit fcc480759a91 · 2015-01-22T17:31:21.000+11:00
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 &lt;geoff@infradead.org&gt;
Signed-off-by: Michael Ellerman &lt;mpe@ellerman.id.au&gt;
diff --git a/drivers/ps3/sys-manager-core.c b/drivers/ps3/sys-manager-core.c
@@ -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();

Original file line number	Diff line number	Diff line change
`@@ -47,23 +47,23 @@ void ps3_sys_manager_register_ops(const struct ps3_sys_manager_ops *ops)`
`47`	`47`	`}`
`48`	`48`	`EXPORT_SYMBOL_GPL(ps3_sys_manager_register_ops);`
`49`	`49`
`50`		`-void ps3_sys_manager_power_off(void)`
	`50`	`+void __noreturn ps3_sys_manager_power_off(void)`
`51`	`51`	`{`
`52`	`52`	`if (ps3_sys_manager_ops.power_off)`
`53`	`53`	`ps3_sys_manager_ops.power_off(ps3_sys_manager_ops.dev);`
`54`	`54`
`55`	`55`	`ps3_sys_manager_halt();`
`56`	`56`	`}`
`57`	`57`
`58`		`-void ps3_sys_manager_restart(void)`
	`58`	`+void __noreturn ps3_sys_manager_restart(void)`
`59`	`59`	`{`
`60`	`60`	`if (ps3_sys_manager_ops.restart)`
`61`	`61`	`ps3_sys_manager_ops.restart(ps3_sys_manager_ops.dev);`
`62`	`62`
`63`	`63`	`ps3_sys_manager_halt();`
`64`	`64`	`}`
`65`	`65`
`66`		`-void ps3_sys_manager_halt(void)`
	`66`	`+void __noreturn ps3_sys_manager_halt(void)`
`67`	`67`	`{`
`68`	`68`	`pr_emerg("System Halted, OK to turn off power\n");`
`69`	`69`	`local_irq_disable();`