[MIPS] TXx9: cleanup and fix some sparse warnings

* Do not return void value
* Make some functions static
* Do not include unnecessary bootinfo.h

Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
Atsushi Nemoto 2008-07-14 00:15:04 +09:00 committed by Ralf Baechle
parent 4c642f3f5e
commit 7b22609442
5 changed files with 8 additions and 27 deletions

View File

@ -140,7 +140,7 @@ void __init prom_init(void)
strcpy(txx9_system_type, txx9_board_vec->system);
return txx9_board_vec->prom_init();
txx9_board_vec->prom_init();
}
void __init prom_free_prom_memory(void)

View File

@ -38,8 +38,6 @@
#ifdef CONFIG_SERIAL_TXX9
#include <linux/serial_core.h>
#endif
#include <asm/bootinfo.h>
#include <asm/txx9tmr.h>
#include <asm/txx9pio.h>
#include <asm/reboot.h>
@ -95,7 +93,6 @@ static void __init jmr3927_time_init(void)
#define DO_WRITE_THROUGH
#define DO_ENABLE_CACHE
extern char * __init prom_getcmdline(void);
static void jmr3927_board_init(void);
static void __init jmr3927_mem_setup(void)

View File

@ -50,8 +50,6 @@
#include <linux/pm.h>
#include <linux/platform_device.h>
#include <linux/delay.h>
#include <asm/bootinfo.h>
#include <asm/io.h>
#include <asm/processor.h>
#include <asm/reboot.h>
@ -65,14 +63,6 @@
#include <linux/serial_core.h>
#endif
/* These functions are used for rebooting or halting the machine*/
extern void toshiba_rbtx4927_restart(char *command);
extern void toshiba_rbtx4927_halt(void);
extern void toshiba_rbtx4927_power_off(void);
extern void toshiba_rbtx4927_irq_setup(void);
char *prom_getcmdline(void);
static int tx4927_ccfg_toeon = 1;
#ifdef CONFIG_PCI
@ -189,7 +179,7 @@ static void __noreturn wait_forever(void)
(*cpu_wait)();
}
void toshiba_rbtx4927_restart(char *command)
static void toshiba_rbtx4927_restart(char *command)
{
printk(KERN_NOTICE "System Rebooting...\n");
@ -209,7 +199,7 @@ void toshiba_rbtx4927_restart(char *command)
/* no return */
}
void toshiba_rbtx4927_halt(void)
static void toshiba_rbtx4927_halt(void)
{
printk(KERN_NOTICE "System Halted\n");
local_irq_disable();
@ -217,7 +207,7 @@ void toshiba_rbtx4927_halt(void)
/* no return */
}
void toshiba_rbtx4927_power_off(void)
static void toshiba_rbtx4927_power_off(void)
{
toshiba_rbtx4927_halt();
/* no return */

View File

@ -23,7 +23,6 @@
#include <asm/time.h>
#include <asm/txx9tmr.h>
#include <asm/io.h>
#include <asm/bootinfo.h>
#include <asm/txx9/generic.h>
#include <asm/txx9/pci.h>
#include <asm/txx9/rbtx4938.h>
@ -34,15 +33,9 @@
#include <asm/txx9/spi.h>
#include <asm/txx9pio.h>
extern char * __init prom_getcmdline(void);
/* These functions are used for rebooting or halting the machine*/
extern void rbtx4938_machine_restart(char *command);
extern void rbtx4938_machine_halt(void);
extern void rbtx4938_machine_power_off(void);
static int tx4938_ccfg_toeon = 1;
void rbtx4938_machine_halt(void)
static void rbtx4938_machine_halt(void)
{
printk(KERN_NOTICE "System Halted\n");
local_irq_disable();
@ -53,13 +46,13 @@ void rbtx4938_machine_halt(void)
".set\tmips0");
}
void rbtx4938_machine_power_off(void)
static void rbtx4938_machine_power_off(void)
{
rbtx4938_machine_halt();
/* no return */
}
void rbtx4938_machine_restart(char *command)
static void rbtx4938_machine_restart(char *command)
{
local_irq_disable();

View File

@ -36,5 +36,6 @@ struct txx9_board_vec {
extern struct txx9_board_vec *txx9_board_vec;
extern int (*txx9_irq_dispatch)(int pending);
void prom_init_cmdline(void);
char *prom_getcmdline(void);
#endif /* __ASM_TXX9_GENERIC_H */