diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2013-01-22 06:59:30 -0500 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2013-02-01 04:00:22 -0500 |
commit | 7034228792cc561e79ff8600f02884bd4c80e287 (patch) | |
tree | 89b77af37d087d9de236fc5d21f60bf552d0a2c6 /arch/mips/dec | |
parent | 405ab01c70e18058d9c01a1256769a61fc65413e (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/dec')
-rw-r--r-- | arch/mips/dec/int-handler.S | 98 | ||||
-rw-r--r-- | arch/mips/dec/kn02xa-berr.c | 4 | ||||
-rw-r--r-- | arch/mips/dec/prom/call_o32.S | 2 | ||||
-rw-r--r-- | arch/mips/dec/prom/dectypes.h | 2 | ||||
-rw-r--r-- | arch/mips/dec/prom/init.c | 2 | ||||
-rw-r--r-- | arch/mips/dec/prom/memory.c | 2 | ||||
-rw-r--r-- | arch/mips/dec/setup.c | 4 | ||||
-rw-r--r-- | arch/mips/dec/wbflush.c | 6 |
8 files changed, 60 insertions, 60 deletions
diff --git a/arch/mips/dec/int-handler.S b/arch/mips/dec/int-handler.S index 82c852818781..22afed16ccde 100644 --- a/arch/mips/dec/int-handler.S +++ b/arch/mips/dec/int-handler.S | |||
@@ -55,70 +55,70 @@ | |||
55 | * DS2100/3100's, aka kn01, aka Pmax: | 55 | * DS2100/3100's, aka kn01, aka Pmax: |
56 | * | 56 | * |
57 | * MIPS IRQ Source | 57 | * MIPS IRQ Source |
58 | * -------- ------ | 58 | * -------- ------ |
59 | * 0 Software (ignored) | 59 | * 0 Software (ignored) |
60 | * 1 Software (ignored) | 60 | * 1 Software (ignored) |
61 | * 2 SCSI | 61 | * 2 SCSI |
62 | * 3 Lance Ethernet | 62 | * 3 Lance Ethernet |
63 | * 4 DZ11 serial | 63 | * 4 DZ11 serial |
64 | * 5 RTC | 64 | * 5 RTC |
65 | * 6 Memory Controller & Video | 65 | * 6 Memory Controller & Video |
66 | * 7 FPU | 66 | * 7 FPU |
67 | * | 67 | * |
68 | * DS5000/200, aka kn02, aka 3max: | 68 | * DS5000/200, aka kn02, aka 3max: |
69 | * | 69 | * |
70 | * MIPS IRQ Source | 70 | * MIPS IRQ Source |
71 | * -------- ------ | 71 | * -------- ------ |
72 | * 0 Software (ignored) | 72 | * 0 Software (ignored) |
73 | * 1 Software (ignored) | 73 | * 1 Software (ignored) |
74 | * 2 TurboChannel | 74 | * 2 TurboChannel |
75 | * 3 RTC | 75 | * 3 RTC |
76 | * 4 Reserved | 76 | * 4 Reserved |
77 | * 5 Memory Controller | 77 | * 5 Memory Controller |
78 | * 6 Reserved | 78 | * 6 Reserved |
79 | * 7 FPU | 79 | * 7 FPU |
80 | * | 80 | * |
81 | * DS5000/1xx's, aka kn02ba, aka 3min: | 81 | * DS5000/1xx's, aka kn02ba, aka 3min: |
82 | * | 82 | * |
83 | * MIPS IRQ Source | 83 | * MIPS IRQ Source |
84 | * -------- ------ | 84 | * -------- ------ |
85 | * 0 Software (ignored) | 85 | * 0 Software (ignored) |
86 | * 1 Software (ignored) | 86 | * 1 Software (ignored) |
87 | * 2 TurboChannel Slot 0 | 87 | * 2 TurboChannel Slot 0 |
88 | * 3 TurboChannel Slot 1 | 88 | * 3 TurboChannel Slot 1 |
89 | * 4 TurboChannel Slot 2 | 89 | * 4 TurboChannel Slot 2 |
90 | * 5 TurboChannel Slot 3 (ASIC) | 90 | * 5 TurboChannel Slot 3 (ASIC) |
91 | * 6 Halt button | 91 | * 6 Halt button |
92 | * 7 FPU/R4k timer | 92 | * 7 FPU/R4k timer |
93 | * | 93 | * |
94 | * DS5000/2x's, aka kn02ca, aka maxine: | 94 | * DS5000/2x's, aka kn02ca, aka maxine: |
95 | * | 95 | * |
96 | * MIPS IRQ Source | 96 | * MIPS IRQ Source |
97 | * -------- ------ | 97 | * -------- ------ |
98 | * 0 Software (ignored) | 98 | * 0 Software (ignored) |
99 | * 1 Software (ignored) | 99 | * 1 Software (ignored) |
100 | * 2 Periodic Interrupt (100usec) | 100 | * 2 Periodic Interrupt (100usec) |
101 | * 3 RTC | 101 | * 3 RTC |
102 | * 4 I/O write timeout | 102 | * 4 I/O write timeout |
103 | * 5 TurboChannel (ASIC) | 103 | * 5 TurboChannel (ASIC) |
104 | * 6 Halt Keycode from Access.Bus keyboard (CTRL-ALT-ENTER) | 104 | * 6 Halt Keycode from Access.Bus keyboard (CTRL-ALT-ENTER) |
105 | * 7 FPU/R4k timer | 105 | * 7 FPU/R4k timer |
106 | * | 106 | * |
107 | * DS5000/2xx's, aka kn03, aka 3maxplus: | 107 | * DS5000/2xx's, aka kn03, aka 3maxplus: |
108 | * | 108 | * |
109 | * MIPS IRQ Source | 109 | * MIPS IRQ Source |
110 | * -------- ------ | 110 | * -------- ------ |
111 | * 0 Software (ignored) | 111 | * 0 Software (ignored) |
112 | * 1 Software (ignored) | 112 | * 1 Software (ignored) |
113 | * 2 System Board (ASIC) | 113 | * 2 System Board (ASIC) |
114 | * 3 RTC | 114 | * 3 RTC |
115 | * 4 Reserved | 115 | * 4 Reserved |
116 | * 5 Memory | 116 | * 5 Memory |
117 | * 6 Halt Button | 117 | * 6 Halt Button |
118 | * 7 FPU/R4k timer | 118 | * 7 FPU/R4k timer |
119 | * | 119 | * |
120 | * We handle the IRQ according to _our_ priority (see setup.c), | 120 | * We handle the IRQ according to _our_ priority (see setup.c), |
121 | * then we just return. If multiple IRQs are pending then we will | 121 | * then we just return. If multiple IRQs are pending then we will |
122 | * just take another exception, big deal. | 122 | * just take another exception, big deal. |
123 | */ | 123 | */ |
124 | .align 5 | 124 | .align 5 |
@@ -146,7 +146,7 @@ | |||
146 | /* | 146 | /* |
147 | * Find irq with highest priority | 147 | * Find irq with highest priority |
148 | */ | 148 | */ |
149 | PTR_LA t1,cpu_mask_nr_tbl | 149 | PTR_LA t1,cpu_mask_nr_tbl |
150 | 1: lw t2,(t1) | 150 | 1: lw t2,(t1) |
151 | nop | 151 | nop |
152 | and t2,t0 | 152 | and t2,t0 |
@@ -195,7 +195,7 @@ | |||
195 | /* | 195 | /* |
196 | * Find irq with highest priority | 196 | * Find irq with highest priority |
197 | */ | 197 | */ |
198 | PTR_LA t1,asic_mask_nr_tbl | 198 | PTR_LA t1,asic_mask_nr_tbl |
199 | 2: lw t2,(t1) | 199 | 2: lw t2,(t1) |
200 | nop | 200 | nop |
201 | and t2,t0 | 201 | and t2,t0 |
@@ -221,7 +221,7 @@ | |||
221 | FEXPORT(cpu_all_int) # HALT, timers, software junk | 221 | FEXPORT(cpu_all_int) # HALT, timers, software junk |
222 | li a0,DEC_CPU_IRQ_BASE | 222 | li a0,DEC_CPU_IRQ_BASE |
223 | srl t0,CAUSEB_IP | 223 | srl t0,CAUSEB_IP |
224 | li t1,CAUSEF_IP>>CAUSEB_IP # mask | 224 | li t1,CAUSEF_IP>>CAUSEB_IP # mask |
225 | b 1f | 225 | b 1f |
226 | li t2,4 # nr of bits / 2 | 226 | li t2,4 # nr of bits / 2 |
227 | 227 | ||
diff --git a/arch/mips/dec/kn02xa-berr.c b/arch/mips/dec/kn02xa-berr.c index ebb73c51d821..f434b759e3b9 100644 --- a/arch/mips/dec/kn02xa-berr.c +++ b/arch/mips/dec/kn02xa-berr.c | |||
@@ -128,8 +128,8 @@ void __init dec_kn02xa_be_init(void) | |||
128 | { | 128 | { |
129 | volatile u32 *mbcs = (void *)CKSEG1ADDR(KN4K_SLOT_BASE + KN4K_MB_CSR); | 129 | volatile u32 *mbcs = (void *)CKSEG1ADDR(KN4K_SLOT_BASE + KN4K_MB_CSR); |
130 | 130 | ||
131 | /* For KN04 we need to make sure EE (?) is enabled in the MB. */ | 131 | /* For KN04 we need to make sure EE (?) is enabled in the MB. */ |
132 | if (current_cpu_type() == CPU_R4000SC) | 132 | if (current_cpu_type() == CPU_R4000SC) |
133 | *mbcs |= KN4K_MB_CSR_EE; | 133 | *mbcs |= KN4K_MB_CSR_EE; |
134 | fast_iob(); | 134 | fast_iob(); |
135 | 135 | ||
diff --git a/arch/mips/dec/prom/call_o32.S b/arch/mips/dec/prom/call_o32.S index 8c8498159e43..c0d1522d448f 100644 --- a/arch/mips/dec/prom/call_o32.S +++ b/arch/mips/dec/prom/call_o32.S | |||
@@ -14,7 +14,7 @@ | |||
14 | 14 | ||
15 | /* Maximum number of arguments supported. Must be even! */ | 15 | /* Maximum number of arguments supported. Must be even! */ |
16 | #define O32_ARGC 32 | 16 | #define O32_ARGC 32 |
17 | /* Number of static registers we save. */ | 17 | /* Number of static registers we save. */ |
18 | #define O32_STATC 11 | 18 | #define O32_STATC 11 |
19 | /* Frame size for both of the above. */ | 19 | /* Frame size for both of the above. */ |
20 | #define O32_FRAMESZ (4 * O32_ARGC + SZREG * O32_STATC) | 20 | #define O32_FRAMESZ (4 * O32_ARGC + SZREG * O32_STATC) |
diff --git a/arch/mips/dec/prom/dectypes.h b/arch/mips/dec/prom/dectypes.h index 707b6f1f5a9d..69ea5b9c8190 100644 --- a/arch/mips/dec/prom/dectypes.h +++ b/arch/mips/dec/prom/dectypes.h | |||
@@ -1,5 +1,5 @@ | |||
1 | #ifndef DECTYPES | 1 | #ifndef DECTYPES |
2 | #define DECTYPES | 2 | #define DECTYPES |
3 | 3 | ||
4 | #define DS2100_3100 1 /* DS2100/3100 Pmax */ | 4 | #define DS2100_3100 1 /* DS2100/3100 Pmax */ |
5 | #define DS5000_200 2 /* DS5000/200 3max */ | 5 | #define DS5000_200 2 /* DS5000/200 3max */ |
diff --git a/arch/mips/dec/prom/init.c b/arch/mips/dec/prom/init.c index 93f1239af524..ab169046e442 100644 --- a/arch/mips/dec/prom/init.c +++ b/arch/mips/dec/prom/init.c | |||
@@ -103,7 +103,7 @@ void __init prom_init(void) | |||
103 | if (prom_is_rex(magic)) | 103 | if (prom_is_rex(magic)) |
104 | rex_clear_cache(); | 104 | rex_clear_cache(); |
105 | 105 | ||
106 | /* Register the early console. */ | 106 | /* Register the early console. */ |
107 | register_prom_console(); | 107 | register_prom_console(); |
108 | 108 | ||
109 | /* Were we compiled with the right CPU option? */ | 109 | /* Were we compiled with the right CPU option? */ |
diff --git a/arch/mips/dec/prom/memory.c b/arch/mips/dec/prom/memory.c index 8c62316f22f4..0aadac742900 100644 --- a/arch/mips/dec/prom/memory.c +++ b/arch/mips/dec/prom/memory.c | |||
@@ -22,7 +22,7 @@ volatile unsigned long mem_err; /* So we know an error occurred */ | |||
22 | 22 | ||
23 | /* | 23 | /* |
24 | * Probe memory in 4MB chunks, waiting for an error to tell us we've fallen | 24 | * Probe memory in 4MB chunks, waiting for an error to tell us we've fallen |
25 | * off the end of real memory. Only suitable for the 2100/3100's (PMAX). | 25 | * off the end of real memory. Only suitable for the 2100/3100's (PMAX). |
26 | */ | 26 | */ |
27 | 27 | ||
28 | #define CHUNK_SIZE 0x400000 | 28 | #define CHUNK_SIZE 0x400000 |
diff --git a/arch/mips/dec/setup.c b/arch/mips/dec/setup.c index b874accd878a..741cb4235bde 100644 --- a/arch/mips/dec/setup.c +++ b/arch/mips/dec/setup.c | |||
@@ -65,7 +65,7 @@ EXPORT_SYMBOL(ioasic_base); | |||
65 | /* | 65 | /* |
66 | * IRQ routing and priority tables. Priorites are set as follows: | 66 | * IRQ routing and priority tables. Priorites are set as follows: |
67 | * | 67 | * |
68 | * KN01 KN230 KN02 KN02-BA KN02-CA KN03 | 68 | * KN01 KN230 KN02 KN02-BA KN02-CA KN03 |
69 | * | 69 | * |
70 | * MEMORY CPU CPU CPU ASIC CPU CPU | 70 | * MEMORY CPU CPU CPU ASIC CPU CPU |
71 | * RTC CPU CPU CPU ASIC CPU CPU | 71 | * RTC CPU CPU CPU ASIC CPU CPU |
@@ -413,7 +413,7 @@ static void __init dec_init_kn02(void) | |||
413 | 413 | ||
414 | /* | 414 | /* |
415 | * Machine-specific initialisation for KN02-BA, aka DS5000/1xx | 415 | * Machine-specific initialisation for KN02-BA, aka DS5000/1xx |
416 | * (xx = 20, 25, 33), aka 3min. Also applies to KN04(-BA), aka | 416 | * (xx = 20, 25, 33), aka 3min. Also applies to KN04(-BA), aka |
417 | * DS5000/150, aka 4min. | 417 | * DS5000/150, aka 4min. |
418 | */ | 418 | */ |
419 | static int kn02ba_interrupt[DEC_NR_INTS] __initdata = { | 419 | static int kn02ba_interrupt[DEC_NR_INTS] __initdata = { |
diff --git a/arch/mips/dec/wbflush.c b/arch/mips/dec/wbflush.c index 43feddd5e19c..56bda4a396b5 100644 --- a/arch/mips/dec/wbflush.c +++ b/arch/mips/dec/wbflush.c | |||
@@ -2,9 +2,9 @@ | |||
2 | * Setup the right wbflush routine for the different DECstations. | 2 | * Setup the right wbflush routine for the different DECstations. |
3 | * | 3 | * |
4 | * Created with information from: | 4 | * Created with information from: |
5 | * DECstation 3100 Desktop Workstation Functional Specification | 5 | * DECstation 3100 Desktop Workstation Functional Specification |
6 | * DECstation 5000/200 KN02 System Module Functional Specification | 6 | * DECstation 5000/200 KN02 System Module Functional Specification |
7 | * mipsel-linux-objdump --disassemble vmunix | grep "wbflush" :-) | 7 | * mipsel-linux-objdump --disassemble vmunix | grep "wbflush" :-) |
8 | * | 8 | * |
9 | * This file is subject to the terms and conditions of the GNU General Public | 9 | * This file is subject to the terms and conditions of the GNU General Public |
10 | * License. See the file "COPYING" in the main directory of this archive | 10 | * License. See the file "COPYING" in the main directory of this archive |