diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2005-09-03 18:56:17 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-05 03:06:07 -0400 |
commit | 42a3b4f25af8f8d77feddf27f839fa0628dbff1a (patch) | |
tree | 332370ff3889fabb66a45fb5dcf605b142de77c8 /arch/mips/mm | |
parent | 875d43e72b5bf22161a81de7554f88eccf8a51ae (diff) |
[PATCH] mips: nuke trailing whitespace
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/mips/mm')
-rw-r--r-- | arch/mips/mm/c-r4k.c | 16 | ||||
-rw-r--r-- | arch/mips/mm/c-sb1.c | 2 | ||||
-rw-r--r-- | arch/mips/mm/cerr-sb1.c | 24 | ||||
-rw-r--r-- | arch/mips/mm/dma-noncoherent.c | 10 | ||||
-rw-r--r-- | arch/mips/mm/pg-sb1.c | 2 |
5 files changed, 27 insertions, 27 deletions
diff --git a/arch/mips/mm/c-r4k.c b/arch/mips/mm/c-r4k.c index 20d40725e5bb..5ea84bc98c6a 100644 --- a/arch/mips/mm/c-r4k.c +++ b/arch/mips/mm/c-r4k.c | |||
@@ -126,13 +126,13 @@ static inline void tx49_blast_icache32(void) | |||
126 | 126 | ||
127 | CACHE32_UNROLL32_ALIGN2; | 127 | CACHE32_UNROLL32_ALIGN2; |
128 | /* I'm in even chunk. blast odd chunks */ | 128 | /* I'm in even chunk. blast odd chunks */ |
129 | for (ws = 0; ws < ws_end; ws += ws_inc) | 129 | for (ws = 0; ws < ws_end; ws += ws_inc) |
130 | for (addr = start + 0x400; addr < end; addr += 0x400 * 2) | 130 | for (addr = start + 0x400; addr < end; addr += 0x400 * 2) |
131 | cache32_unroll32(addr|ws,Index_Invalidate_I); | 131 | cache32_unroll32(addr|ws,Index_Invalidate_I); |
132 | CACHE32_UNROLL32_ALIGN; | 132 | CACHE32_UNROLL32_ALIGN; |
133 | /* I'm in odd chunk. blast even chunks */ | 133 | /* I'm in odd chunk. blast even chunks */ |
134 | for (ws = 0; ws < ws_end; ws += ws_inc) | 134 | for (ws = 0; ws < ws_end; ws += ws_inc) |
135 | for (addr = start; addr < end; addr += 0x400 * 2) | 135 | for (addr = start; addr < end; addr += 0x400 * 2) |
136 | cache32_unroll32(addr|ws,Index_Invalidate_I); | 136 | cache32_unroll32(addr|ws,Index_Invalidate_I); |
137 | } | 137 | } |
138 | 138 | ||
@@ -156,13 +156,13 @@ static inline void tx49_blast_icache32_page_indexed(unsigned long page) | |||
156 | 156 | ||
157 | CACHE32_UNROLL32_ALIGN2; | 157 | CACHE32_UNROLL32_ALIGN2; |
158 | /* I'm in even chunk. blast odd chunks */ | 158 | /* I'm in even chunk. blast odd chunks */ |
159 | for (ws = 0; ws < ws_end; ws += ws_inc) | 159 | for (ws = 0; ws < ws_end; ws += ws_inc) |
160 | for (addr = start + 0x400; addr < end; addr += 0x400 * 2) | 160 | for (addr = start + 0x400; addr < end; addr += 0x400 * 2) |
161 | cache32_unroll32(addr|ws,Index_Invalidate_I); | 161 | cache32_unroll32(addr|ws,Index_Invalidate_I); |
162 | CACHE32_UNROLL32_ALIGN; | 162 | CACHE32_UNROLL32_ALIGN; |
163 | /* I'm in odd chunk. blast even chunks */ | 163 | /* I'm in odd chunk. blast even chunks */ |
164 | for (ws = 0; ws < ws_end; ws += ws_inc) | 164 | for (ws = 0; ws < ws_end; ws += ws_inc) |
165 | for (addr = start; addr < end; addr += 0x400 * 2) | 165 | for (addr = start; addr < end; addr += 0x400 * 2) |
166 | cache32_unroll32(addr|ws,Index_Invalidate_I); | 166 | cache32_unroll32(addr|ws,Index_Invalidate_I); |
167 | } | 167 | } |
168 | 168 | ||
diff --git a/arch/mips/mm/c-sb1.c b/arch/mips/mm/c-sb1.c index ab30afd63b32..502f68c664b2 100644 --- a/arch/mips/mm/c-sb1.c +++ b/arch/mips/mm/c-sb1.c | |||
@@ -270,7 +270,7 @@ static void local_sb1_flush_icache_range(unsigned long start, | |||
270 | __sb1_writeback_inv_dcache_all(); | 270 | __sb1_writeback_inv_dcache_all(); |
271 | else | 271 | else |
272 | __sb1_writeback_inv_dcache_range(start, end); | 272 | __sb1_writeback_inv_dcache_range(start, end); |
273 | 273 | ||
274 | /* Just flush the whole icache if the range is big enough */ | 274 | /* Just flush the whole icache if the range is big enough */ |
275 | if ((end - start) > icache_range_cutoff) | 275 | if ((end - start) > icache_range_cutoff) |
276 | __sb1_flush_icache_all(); | 276 | __sb1_flush_icache_all(); |
diff --git a/arch/mips/mm/cerr-sb1.c b/arch/mips/mm/cerr-sb1.c index 13d96d62764e..7166ffe63502 100644 --- a/arch/mips/mm/cerr-sb1.c +++ b/arch/mips/mm/cerr-sb1.c | |||
@@ -25,7 +25,7 @@ | |||
25 | #include <asm/sibyte/sb1250_regs.h> | 25 | #include <asm/sibyte/sb1250_regs.h> |
26 | #include <asm/sibyte/sb1250_scd.h> | 26 | #include <asm/sibyte/sb1250_scd.h> |
27 | #endif | 27 | #endif |
28 | 28 | ||
29 | /* SB1 definitions */ | 29 | /* SB1 definitions */ |
30 | 30 | ||
31 | /* XXX should come from config1 XXX */ | 31 | /* XXX should come from config1 XXX */ |
@@ -136,14 +136,14 @@ static inline void breakout_cerrd(unsigned int val) | |||
136 | 136 | ||
137 | #ifndef CONFIG_SIBYTE_BUS_WATCHER | 137 | #ifndef CONFIG_SIBYTE_BUS_WATCHER |
138 | 138 | ||
139 | static void check_bus_watcher(void) | 139 | static void check_bus_watcher(void) |
140 | { | 140 | { |
141 | uint32_t status, l2_err, memio_err; | 141 | uint32_t status, l2_err, memio_err; |
142 | 142 | ||
143 | /* Destructive read, clears register and interrupt */ | 143 | /* Destructive read, clears register and interrupt */ |
144 | status = csr_in32(IOADDR(A_SCD_BUS_ERR_STATUS)); | 144 | status = csr_in32(IOADDR(A_SCD_BUS_ERR_STATUS)); |
145 | /* Bit 31 is always on, but there's no #define for that */ | 145 | /* Bit 31 is always on, but there's no #define for that */ |
146 | if (status & ~(1UL << 31)) { | 146 | if (status & ~(1UL << 31)) { |
147 | l2_err = csr_in32(IOADDR(A_BUS_L2_ERRORS)); | 147 | l2_err = csr_in32(IOADDR(A_BUS_L2_ERRORS)); |
148 | memio_err = csr_in32(IOADDR(A_BUS_MEM_IO_ERRORS)); | 148 | memio_err = csr_in32(IOADDR(A_BUS_MEM_IO_ERRORS)); |
149 | prom_printf("Bus watcher error counters: %08x %08x\n", l2_err, memio_err); | 149 | prom_printf("Bus watcher error counters: %08x %08x\n", l2_err, memio_err); |
@@ -153,14 +153,14 @@ static void check_bus_watcher(void) | |||
153 | (int)(G_SCD_BERR_TID(status) >> 6), | 153 | (int)(G_SCD_BERR_TID(status) >> 6), |
154 | (int)G_SCD_BERR_RID(status), | 154 | (int)G_SCD_BERR_RID(status), |
155 | (int)G_SCD_BERR_DCODE(status)); | 155 | (int)G_SCD_BERR_DCODE(status)); |
156 | } else { | 156 | } else { |
157 | prom_printf("Bus watcher indicates no error\n"); | 157 | prom_printf("Bus watcher indicates no error\n"); |
158 | } | 158 | } |
159 | } | 159 | } |
160 | #else | 160 | #else |
161 | extern void check_bus_watcher(void); | 161 | extern void check_bus_watcher(void); |
162 | #endif | 162 | #endif |
163 | 163 | ||
164 | asmlinkage void sb1_cache_error(void) | 164 | asmlinkage void sb1_cache_error(void) |
165 | { | 165 | { |
166 | uint64_t cerr_dpa; | 166 | uint64_t cerr_dpa; |
diff --git a/arch/mips/mm/dma-noncoherent.c b/arch/mips/mm/dma-noncoherent.c index 9895e32b0fce..59e54f12212e 100644 --- a/arch/mips/mm/dma-noncoherent.c +++ b/arch/mips/mm/dma-noncoherent.c | |||
@@ -162,7 +162,7 @@ int dma_map_sg(struct device *dev, struct scatterlist *sg, int nents, | |||
162 | 162 | ||
163 | for (i = 0; i < nents; i++, sg++) { | 163 | for (i = 0; i < nents; i++, sg++) { |
164 | unsigned long addr; | 164 | unsigned long addr; |
165 | 165 | ||
166 | addr = (unsigned long) page_address(sg->page); | 166 | addr = (unsigned long) page_address(sg->page); |
167 | if (addr) | 167 | if (addr) |
168 | __dma_sync(addr + sg->offset, sg->length, direction); | 168 | __dma_sync(addr + sg->offset, sg->length, direction); |
@@ -230,9 +230,9 @@ void dma_sync_single_for_cpu(struct device *dev, dma_addr_t dma_handle, | |||
230 | size_t size, enum dma_data_direction direction) | 230 | size_t size, enum dma_data_direction direction) |
231 | { | 231 | { |
232 | unsigned long addr; | 232 | unsigned long addr; |
233 | 233 | ||
234 | BUG_ON(direction == DMA_NONE); | 234 | BUG_ON(direction == DMA_NONE); |
235 | 235 | ||
236 | addr = dma_handle + PAGE_OFFSET; | 236 | addr = dma_handle + PAGE_OFFSET; |
237 | __dma_sync(addr, size, direction); | 237 | __dma_sync(addr, size, direction); |
238 | } | 238 | } |
@@ -282,9 +282,9 @@ void dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg, int nelems, | |||
282 | enum dma_data_direction direction) | 282 | enum dma_data_direction direction) |
283 | { | 283 | { |
284 | int i; | 284 | int i; |
285 | 285 | ||
286 | BUG_ON(direction == DMA_NONE); | 286 | BUG_ON(direction == DMA_NONE); |
287 | 287 | ||
288 | /* Make sure that gcc doesn't leave the empty loop body. */ | 288 | /* Make sure that gcc doesn't leave the empty loop body. */ |
289 | for (i = 0; i < nelems; i++, sg++) | 289 | for (i = 0; i < nelems; i++, sg++) |
290 | __dma_sync((unsigned long)page_address(sg->page), | 290 | __dma_sync((unsigned long)page_address(sg->page), |
diff --git a/arch/mips/mm/pg-sb1.c b/arch/mips/mm/pg-sb1.c index b63e1ca350f5..1b6df7133c1e 100644 --- a/arch/mips/mm/pg-sb1.c +++ b/arch/mips/mm/pg-sb1.c | |||
@@ -198,7 +198,7 @@ static inline void copy_page_cpu(void *to, void *from) | |||
198 | 198 | ||
199 | /* | 199 | /* |
200 | * Pad descriptors to cacheline, since each is exclusively owned by a | 200 | * Pad descriptors to cacheline, since each is exclusively owned by a |
201 | * particular CPU. | 201 | * particular CPU. |
202 | */ | 202 | */ |
203 | typedef struct dmadscr_s { | 203 | typedef struct dmadscr_s { |
204 | u64 dscr_a; | 204 | u64 dscr_a; |