diff options
Diffstat (limited to 'arch/mips/mips-boards/generic')
-rw-r--r-- | arch/mips/mips-boards/generic/init.c | 12 | ||||
-rw-r--r-- | arch/mips/mips-boards/generic/memory.c | 4 | ||||
-rw-r--r-- | arch/mips/mips-boards/generic/pci.c | 2 | ||||
-rw-r--r-- | arch/mips/mips-boards/generic/time.c | 6 |
4 files changed, 12 insertions, 12 deletions
diff --git a/arch/mips/mips-boards/generic/init.c b/arch/mips/mips-boards/generic/init.c index e2c7147fedf7..30f1f54cb68b 100644 --- a/arch/mips/mips-boards/generic/init.c +++ b/arch/mips/mips-boards/generic/init.c | |||
@@ -166,15 +166,15 @@ static void __init console_config(void) | |||
166 | bits = '8'; | 166 | bits = '8'; |
167 | if (flow == '\0') | 167 | if (flow == '\0') |
168 | flow = 'r'; | 168 | flow = 'r'; |
169 | sprintf (console_string, " console=ttyS0,%d%c%c%c", baud, parity, bits, flow); | 169 | sprintf(console_string, " console=ttyS0,%d%c%c%c", baud, parity, bits, flow); |
170 | strcat (prom_getcmdline(), console_string); | 170 | strcat(prom_getcmdline(), console_string); |
171 | pr_info("Config serial console:%s\n", console_string); | 171 | pr_info("Config serial console:%s\n", console_string); |
172 | } | 172 | } |
173 | } | 173 | } |
174 | #endif | 174 | #endif |
175 | 175 | ||
176 | #ifdef CONFIG_KGDB | 176 | #ifdef CONFIG_KGDB |
177 | void __init kgdb_config (void) | 177 | void __init kgdb_config(void) |
178 | { | 178 | { |
179 | extern int (*generic_putDebugChar)(char); | 179 | extern int (*generic_putDebugChar)(char); |
180 | extern char (*generic_getDebugChar)(void); | 180 | extern char (*generic_getDebugChar)(void); |
@@ -218,7 +218,7 @@ void __init kgdb_config (void) | |||
218 | { | 218 | { |
219 | char *s; | 219 | char *s; |
220 | for (s = "Please connect GDB to this port\r\n"; *s; ) | 220 | for (s = "Please connect GDB to this port\r\n"; *s; ) |
221 | generic_putDebugChar (*s++); | 221 | generic_putDebugChar(*s++); |
222 | } | 222 | } |
223 | 223 | ||
224 | /* Breakpoint is invoked after interrupts are initialised */ | 224 | /* Breakpoint is invoked after interrupts are initialised */ |
@@ -226,7 +226,7 @@ void __init kgdb_config (void) | |||
226 | } | 226 | } |
227 | #endif | 227 | #endif |
228 | 228 | ||
229 | void __init mips_nmi_setup (void) | 229 | void __init mips_nmi_setup(void) |
230 | { | 230 | { |
231 | void *base; | 231 | void *base; |
232 | extern char except_vec_nmi; | 232 | extern char except_vec_nmi; |
@@ -238,7 +238,7 @@ void __init mips_nmi_setup (void) | |||
238 | flush_icache_range((unsigned long)base, (unsigned long)base + 0x80); | 238 | flush_icache_range((unsigned long)base, (unsigned long)base + 0x80); |
239 | } | 239 | } |
240 | 240 | ||
241 | void __init mips_ejtag_setup (void) | 241 | void __init mips_ejtag_setup(void) |
242 | { | 242 | { |
243 | void *base; | 243 | void *base; |
244 | extern char except_vec_ejtag_debug; | 244 | extern char except_vec_ejtag_debug; |
diff --git a/arch/mips/mips-boards/generic/memory.c b/arch/mips/mips-boards/generic/memory.c index ae39953da2c4..dc272c188233 100644 --- a/arch/mips/mips-boards/generic/memory.c +++ b/arch/mips/mips-boards/generic/memory.c | |||
@@ -125,7 +125,7 @@ struct prom_pmemblock * __init prom_getmdesc(void) | |||
125 | return &mdesc[0]; | 125 | return &mdesc[0]; |
126 | } | 126 | } |
127 | 127 | ||
128 | static int __init prom_memtype_classify (unsigned int type) | 128 | static int __init prom_memtype_classify(unsigned int type) |
129 | { | 129 | { |
130 | switch (type) { | 130 | switch (type) { |
131 | case yamon_free: | 131 | case yamon_free: |
@@ -158,7 +158,7 @@ void __init prom_meminit(void) | |||
158 | long type; | 158 | long type; |
159 | unsigned long base, size; | 159 | unsigned long base, size; |
160 | 160 | ||
161 | type = prom_memtype_classify (p->type); | 161 | type = prom_memtype_classify(p->type); |
162 | base = p->base; | 162 | base = p->base; |
163 | size = p->size; | 163 | size = p->size; |
164 | 164 | ||
diff --git a/arch/mips/mips-boards/generic/pci.c b/arch/mips/mips-boards/generic/pci.c index c9852206890a..b9743190609a 100644 --- a/arch/mips/mips-boards/generic/pci.c +++ b/arch/mips/mips-boards/generic/pci.c | |||
@@ -239,5 +239,5 @@ void __init mips_pcibios_init(void) | |||
239 | iomem_resource.end &= 0xfffffffffULL; /* 64 GB */ | 239 | iomem_resource.end &= 0xfffffffffULL; /* 64 GB */ |
240 | ioport_resource.end = controller->io_resource->end; | 240 | ioport_resource.end = controller->io_resource->end; |
241 | 241 | ||
242 | register_pci_controller (controller); | 242 | register_pci_controller(controller); |
243 | } | 243 | } |
diff --git a/arch/mips/mips-boards/generic/time.c b/arch/mips/mips-boards/generic/time.c index 4fab3b2e8736..1d00b778ff1e 100644 --- a/arch/mips/mips-boards/generic/time.c +++ b/arch/mips/mips-boards/generic/time.c | |||
@@ -134,7 +134,7 @@ void __init plat_time_init(void) | |||
134 | /* Set Data mode - binary. */ | 134 | /* Set Data mode - binary. */ |
135 | CMOS_WRITE(CMOS_READ(RTC_CONTROL) | RTC_DM_BINARY, RTC_CONTROL); | 135 | CMOS_WRITE(CMOS_READ(RTC_CONTROL) | RTC_DM_BINARY, RTC_CONTROL); |
136 | 136 | ||
137 | est_freq = estimate_cpu_frequency (); | 137 | est_freq = estimate_cpu_frequency(); |
138 | 138 | ||
139 | printk("CPU frequency %d.%02d MHz\n", est_freq/1000000, | 139 | printk("CPU frequency %d.%02d MHz\n", est_freq/1000000, |
140 | (est_freq%1000000)*100/1000000); | 140 | (est_freq%1000000)*100/1000000); |
@@ -166,7 +166,7 @@ void __init plat_perf_setup(void) | |||
166 | 166 | ||
167 | #ifdef MSC01E_INT_BASE | 167 | #ifdef MSC01E_INT_BASE |
168 | if (cpu_has_veic) { | 168 | if (cpu_has_veic) { |
169 | set_vi_handler (MSC01E_INT_PERFCTR, mips_perf_dispatch); | 169 | set_vi_handler(MSC01E_INT_PERFCTR, mips_perf_dispatch); |
170 | cp0_perfcount_irq = MSC01E_INT_BASE + MSC01E_INT_PERFCTR; | 170 | cp0_perfcount_irq = MSC01E_INT_BASE + MSC01E_INT_PERFCTR; |
171 | } else | 171 | } else |
172 | #endif | 172 | #endif |
@@ -183,7 +183,7 @@ void __init plat_timer_setup(struct irqaction *irq) | |||
183 | { | 183 | { |
184 | #ifdef MSC01E_INT_BASE | 184 | #ifdef MSC01E_INT_BASE |
185 | if (cpu_has_veic) { | 185 | if (cpu_has_veic) { |
186 | set_vi_handler (MSC01E_INT_CPUCTR, mips_timer_dispatch); | 186 | set_vi_handler(MSC01E_INT_CPUCTR, mips_timer_dispatch); |
187 | mips_cpu_timer_irq = MSC01E_INT_BASE + MSC01E_INT_CPUCTR; | 187 | mips_cpu_timer_irq = MSC01E_INT_BASE + MSC01E_INT_CPUCTR; |
188 | } | 188 | } |
189 | else | 189 | else |