diff options
author | Atsushi Nemoto <anemo@mba.ocn.ne.jp> | 2008-07-13 11:15:04 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2008-07-15 13:44:38 -0400 |
commit | 7b22609442a32050e37cec5f6735376af61e68a1 (patch) | |
tree | db340f9fc91d480c16ebdbdc4e0b9fa90995e756 /arch/mips/txx9/rbtx4927/setup.c | |
parent | 4c642f3f5e9f3f1a2fcce2c3fa1a94bf80142202 (diff) |
[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>
Diffstat (limited to 'arch/mips/txx9/rbtx4927/setup.c')
-rw-r--r-- | arch/mips/txx9/rbtx4927/setup.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/arch/mips/txx9/rbtx4927/setup.c b/arch/mips/txx9/rbtx4927/setup.c index aba11f376a51..1657fd935da8 100644 --- a/arch/mips/txx9/rbtx4927/setup.c +++ b/arch/mips/txx9/rbtx4927/setup.c | |||
@@ -50,8 +50,6 @@ | |||
50 | #include <linux/pm.h> | 50 | #include <linux/pm.h> |
51 | #include <linux/platform_device.h> | 51 | #include <linux/platform_device.h> |
52 | #include <linux/delay.h> | 52 | #include <linux/delay.h> |
53 | |||
54 | #include <asm/bootinfo.h> | ||
55 | #include <asm/io.h> | 53 | #include <asm/io.h> |
56 | #include <asm/processor.h> | 54 | #include <asm/processor.h> |
57 | #include <asm/reboot.h> | 55 | #include <asm/reboot.h> |
@@ -65,14 +63,6 @@ | |||
65 | #include <linux/serial_core.h> | 63 | #include <linux/serial_core.h> |
66 | #endif | 64 | #endif |
67 | 65 | ||
68 | /* These functions are used for rebooting or halting the machine*/ | ||
69 | extern void toshiba_rbtx4927_restart(char *command); | ||
70 | extern void toshiba_rbtx4927_halt(void); | ||
71 | extern void toshiba_rbtx4927_power_off(void); | ||
72 | extern void toshiba_rbtx4927_irq_setup(void); | ||
73 | |||
74 | char *prom_getcmdline(void); | ||
75 | |||
76 | static int tx4927_ccfg_toeon = 1; | 66 | static int tx4927_ccfg_toeon = 1; |
77 | 67 | ||
78 | #ifdef CONFIG_PCI | 68 | #ifdef CONFIG_PCI |
@@ -189,7 +179,7 @@ static void __noreturn wait_forever(void) | |||
189 | (*cpu_wait)(); | 179 | (*cpu_wait)(); |
190 | } | 180 | } |
191 | 181 | ||
192 | void toshiba_rbtx4927_restart(char *command) | 182 | static void toshiba_rbtx4927_restart(char *command) |
193 | { | 183 | { |
194 | printk(KERN_NOTICE "System Rebooting...\n"); | 184 | printk(KERN_NOTICE "System Rebooting...\n"); |
195 | 185 | ||
@@ -209,7 +199,7 @@ void toshiba_rbtx4927_restart(char *command) | |||
209 | /* no return */ | 199 | /* no return */ |
210 | } | 200 | } |
211 | 201 | ||
212 | void toshiba_rbtx4927_halt(void) | 202 | static void toshiba_rbtx4927_halt(void) |
213 | { | 203 | { |
214 | printk(KERN_NOTICE "System Halted\n"); | 204 | printk(KERN_NOTICE "System Halted\n"); |
215 | local_irq_disable(); | 205 | local_irq_disable(); |
@@ -217,7 +207,7 @@ void toshiba_rbtx4927_halt(void) | |||
217 | /* no return */ | 207 | /* no return */ |
218 | } | 208 | } |
219 | 209 | ||
220 | void toshiba_rbtx4927_power_off(void) | 210 | static void toshiba_rbtx4927_power_off(void) |
221 | { | 211 | { |
222 | toshiba_rbtx4927_halt(); | 212 | toshiba_rbtx4927_halt(); |
223 | /* no return */ | 213 | /* no return */ |