aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/sibyte/sb1250
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2013-01-22 06:59:30 -0500
committerRalf Baechle <ralf@linux-mips.org>2013-02-01 04:00:22 -0500
commit7034228792cc561e79ff8600f02884bd4c80e287 (patch)
tree89b77af37d087d9de236fc5d21f60bf552d0a2c6 /arch/mips/sibyte/sb1250
parent405ab01c70e18058d9c01a1256769a61fc65413e (diff)
MIPS: Whitespace cleanup.
Having received another series of whitespace patches I decided to do this once and for all rather than dealing with this kind of patches trickling in forever. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/sibyte/sb1250')
-rw-r--r--arch/mips/sibyte/sb1250/bus_watcher.c6
-rw-r--r--arch/mips/sibyte/sb1250/irq.c8
-rw-r--r--arch/mips/sibyte/sb1250/setup.c18
3 files changed, 16 insertions, 16 deletions
diff --git a/arch/mips/sibyte/sb1250/bus_watcher.c b/arch/mips/sibyte/sb1250/bus_watcher.c
index 86e6e54dd15d..e651105b3f0b 100644
--- a/arch/mips/sibyte/sb1250/bus_watcher.c
+++ b/arch/mips/sibyte/sb1250/bus_watcher.c
@@ -71,7 +71,7 @@ static void print_summary(uint32_t status, uint32_t l2_err,
71 * already been destructively read out of the registers. 71 * already been destructively read out of the registers.
72 * 72 *
73 * notes: this is currently used by the cache error handler 73 * notes: this is currently used by the cache error handler
74 * should provide locking against the interrupt handler 74 * should provide locking against the interrupt handler
75 */ 75 */
76void check_bus_watcher(void) 76void check_bus_watcher(void)
77{ 77{
@@ -119,7 +119,7 @@ static int bw_print_buffer(char *page, struct bw_stats_struct *stats)
119 (int)G_SCD_BERR_RID(stats->status), 119 (int)G_SCD_BERR_RID(stats->status),
120 (int)G_SCD_BERR_DCODE(stats->status)); 120 (int)G_SCD_BERR_DCODE(stats->status));
121 /* XXXKW indicate multiple errors between printings, or stats 121 /* XXXKW indicate multiple errors between printings, or stats
122 collection (or both)? */ 122 collection (or both)? */
123 if (stats->status & M_SCD_BERR_MULTERRS) 123 if (stats->status & M_SCD_BERR_MULTERRS)
124 len += sprintf(page+len, "Multiple errors observed since last check.\n"); 124 len += sprintf(page+len, "Multiple errors observed since last check.\n");
125 if (stats->status_printed) { 125 if (stats->status_printed) {
@@ -168,7 +168,7 @@ static void create_proc_decoder(struct bw_stats_struct *stats)
168 * sibyte_bw_int - handle bus watcher interrupts and accumulate counts 168 * sibyte_bw_int - handle bus watcher interrupts and accumulate counts
169 * 169 *
170 * notes: possible re-entry due to multiple sources 170 * notes: possible re-entry due to multiple sources
171 * should check/indicate saturation 171 * should check/indicate saturation
172 */ 172 */
173static irqreturn_t sibyte_bw_int(int irq, void *data) 173static irqreturn_t sibyte_bw_int(int irq, void *data)
174{ 174{
diff --git a/arch/mips/sibyte/sb1250/irq.c b/arch/mips/sibyte/sb1250/irq.c
index 340aaf626659..fca0cdb99509 100644
--- a/arch/mips/sibyte/sb1250/irq.c
+++ b/arch/mips/sibyte/sb1250/irq.c
@@ -264,7 +264,7 @@ void __init arch_init_irq(void)
264 IOADDR(A_IMR_REGISTER(1, R_IMR_INTERRUPT_MAP_BASE) + 264 IOADDR(A_IMR_REGISTER(1, R_IMR_INTERRUPT_MAP_BASE) +
265 (K_INT_MBOX_0 << 3))); 265 (K_INT_MBOX_0 << 3)));
266 266
267 /* Clear the mailboxes. The firmware may leave them dirty */ 267 /* Clear the mailboxes. The firmware may leave them dirty */
268 __raw_writeq(0xffffffffffffffffULL, 268 __raw_writeq(0xffffffffffffffffULL,
269 IOADDR(A_IMR_REGISTER(0, R_IMR_MAILBOX_CLR_CPU))); 269 IOADDR(A_IMR_REGISTER(0, R_IMR_MAILBOX_CLR_CPU)));
270 __raw_writeq(0xffffffffffffffffULL, 270 __raw_writeq(0xffffffffffffffffULL,
@@ -277,7 +277,7 @@ void __init arch_init_irq(void)
277 277
278 /* 278 /*
279 * Note that the timer interrupts are also mapped, but this is 279 * Note that the timer interrupts are also mapped, but this is
280 * done in sb1250_time_init(). Also, the profiling driver 280 * done in sb1250_time_init(). Also, the profiling driver
281 * does its own management of IP7. 281 * does its own management of IP7.
282 */ 282 */
283 283
@@ -294,7 +294,7 @@ static inline void dispatch_ip2(void)
294 294
295 /* 295 /*
296 * Default...we've hit an IP[2] interrupt, which means we've got to 296 * Default...we've hit an IP[2] interrupt, which means we've got to
297 * check the 1250 interrupt registers to figure out what to do. Need 297 * check the 1250 interrupt registers to figure out what to do. Need
298 * to detect which CPU we're on, now that smp_affinity is supported. 298 * to detect which CPU we're on, now that smp_affinity is supported.
299 */ 299 */
300 mask = __raw_readq(IOADDR(A_IMR_REGISTER(cpu, 300 mask = __raw_readq(IOADDR(A_IMR_REGISTER(cpu,
@@ -323,7 +323,7 @@ asmlinkage void plat_irq_dispatch(void)
323 if (pending & CAUSEF_IP7) /* CPU performance counter interrupt */ 323 if (pending & CAUSEF_IP7) /* CPU performance counter interrupt */
324 do_IRQ(MIPS_CPU_IRQ_BASE + 7); 324 do_IRQ(MIPS_CPU_IRQ_BASE + 7);
325 else if (pending & CAUSEF_IP4) 325 else if (pending & CAUSEF_IP4)
326 do_IRQ(K_INT_TIMER_0 + cpu); /* sb1250_timer_interrupt() */ 326 do_IRQ(K_INT_TIMER_0 + cpu); /* sb1250_timer_interrupt() */
327 327
328#ifdef CONFIG_SMP 328#ifdef CONFIG_SMP
329 else if (pending & CAUSEF_IP3) 329 else if (pending & CAUSEF_IP3)
diff --git a/arch/mips/sibyte/sb1250/setup.c b/arch/mips/sibyte/sb1250/setup.c
index 92da3155ce07..a14bd4cb0bc0 100644
--- a/arch/mips/sibyte/sb1250/setup.c
+++ b/arch/mips/sibyte/sb1250/setup.c
@@ -203,8 +203,8 @@ void __init sb1250_setup(void)
203 case K_SYS_REVISION_BCM1250_PASS1: 203 case K_SYS_REVISION_BCM1250_PASS1:
204#ifndef CONFIG_SB1_PASS_1_WORKAROUNDS 204#ifndef CONFIG_SB1_PASS_1_WORKAROUNDS
205 printk("@@@@ This is a BCM1250 A0-A2 (Pass 1) board, " 205 printk("@@@@ This is a BCM1250 A0-A2 (Pass 1) board, "
206 "and the kernel doesn't have the proper " 206 "and the kernel doesn't have the proper "
207 "workarounds compiled in. @@@@\n"); 207 "workarounds compiled in. @@@@\n");
208 bad_config = 1; 208 bad_config = 1;
209#endif 209#endif
210 break; 210 break;
@@ -213,28 +213,28 @@ void __init sb1250_setup(void)
213#if !defined(CONFIG_SB1_PASS_2_WORKAROUNDS) || \ 213#if !defined(CONFIG_SB1_PASS_2_WORKAROUNDS) || \
214 !defined(CONFIG_SB1_PASS_2_1_WORKAROUNDS) 214 !defined(CONFIG_SB1_PASS_2_1_WORKAROUNDS)
215 printk("@@@@ This is a BCM1250 A3-A10 board, and the " 215 printk("@@@@ This is a BCM1250 A3-A10 board, and the "
216 "kernel doesn't have the proper workarounds " 216 "kernel doesn't have the proper workarounds "
217 "compiled in. @@@@\n"); 217 "compiled in. @@@@\n");
218 bad_config = 1; 218 bad_config = 1;
219#endif 219#endif
220#ifdef CONFIG_CPU_HAS_PREFETCH 220#ifdef CONFIG_CPU_HAS_PREFETCH
221 printk("@@@@ Prefetches may be enabled in this kernel, " 221 printk("@@@@ Prefetches may be enabled in this kernel, "
222 "but are buggy on this board. @@@@\n"); 222 "but are buggy on this board. @@@@\n");
223 bad_config = 1; 223 bad_config = 1;
224#endif 224#endif
225 break; 225 break;
226 case K_SYS_REVISION_BCM1250_PASS2_2: 226 case K_SYS_REVISION_BCM1250_PASS2_2:
227#ifndef CONFIG_SB1_PASS_2_WORKAROUNDS 227#ifndef CONFIG_SB1_PASS_2_WORKAROUNDS
228 printk("@@@@ This is a BCM1250 B1/B2. board, and the " 228 printk("@@@@ This is a BCM1250 B1/B2. board, and the "
229 "kernel doesn't have the proper workarounds " 229 "kernel doesn't have the proper workarounds "
230 "compiled in. @@@@\n"); 230 "compiled in. @@@@\n");
231 bad_config = 1; 231 bad_config = 1;
232#endif 232#endif
233#if defined(CONFIG_SB1_PASS_2_1_WORKAROUNDS) || \ 233#if defined(CONFIG_SB1_PASS_2_1_WORKAROUNDS) || \
234 !defined(CONFIG_CPU_HAS_PREFETCH) 234 !defined(CONFIG_CPU_HAS_PREFETCH)
235 printk("@@@@ This is a BCM1250 B1/B2, but the kernel is " 235 printk("@@@@ This is a BCM1250 B1/B2, but the kernel is "
236 "conservatively configured for an 'A' stepping. " 236 "conservatively configured for an 'A' stepping. "
237 "@@@@\n"); 237 "@@@@\n");
238#endif 238#endif
239 break; 239 break;
240 default: 240 default: