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)
 
         CACHE32_UNROLL32_ALIGN2;
         /* I'm in even chunk.  blast odd chunks */
-        for (ws = 0; ws < ws_end; ws += ws_inc) 
-                for (addr = start + 0x400; addr < end; addr += 0x400 * 2) 
+        for (ws = 0; ws < ws_end; ws += ws_inc)
+                for (addr = start + 0x400; addr < end; addr += 0x400 * 2)
                         cache32_unroll32(addr|ws,Index_Invalidate_I);
         CACHE32_UNROLL32_ALIGN;
         /* I'm in odd chunk.  blast even chunks */
-        for (ws = 0; ws < ws_end; ws += ws_inc) 
-                for (addr = start; addr < end; addr += 0x400 * 2) 
+        for (ws = 0; ws < ws_end; ws += ws_inc)
+                for (addr = start; addr < end; addr += 0x400 * 2)
                         cache32_unroll32(addr|ws,Index_Invalidate_I);
 }
 
@@ -156,13 +156,13 @@ static inline void tx49_blast_icache32_page_indexed(unsigned long page)
 
         CACHE32_UNROLL32_ALIGN2;
         /* I'm in even chunk.  blast odd chunks */
-        for (ws = 0; ws < ws_end; ws += ws_inc) 
-                for (addr = start + 0x400; addr < end; addr += 0x400 * 2) 
+        for (ws = 0; ws < ws_end; ws += ws_inc)
+                for (addr = start + 0x400; addr < end; addr += 0x400 * 2)
                         cache32_unroll32(addr|ws,Index_Invalidate_I);
         CACHE32_UNROLL32_ALIGN;
         /* I'm in odd chunk.  blast even chunks */
-        for (ws = 0; ws < ws_end; ws += ws_inc) 
-                for (addr = start; addr < end; addr += 0x400 * 2) 
+        for (ws = 0; ws < ws_end; ws += ws_inc)
+                for (addr = start; addr < end; addr += 0x400 * 2)
                         cache32_unroll32(addr|ws,Index_Invalidate_I);
 }
 
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,
                 __sb1_writeback_inv_dcache_all();
         else
                 __sb1_writeback_inv_dcache_range(start, end);
-        
+
         /* Just flush the whole icache if the range is big enough */
         if ((end - start) > icache_range_cutoff)
                 __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 @@
 #include <asm/sibyte/sb1250_regs.h>
 #include <asm/sibyte/sb1250_scd.h>
 #endif
- 
+
 /* SB1 definitions */
 
 /* XXX should come from config1 XXX */
@@ -136,14 +136,14 @@ static inline void breakout_cerrd(unsigned int val)
 
 #ifndef CONFIG_SIBYTE_BUS_WATCHER
 
-static void check_bus_watcher(void)              
-{                               
+static void check_bus_watcher(void)
+{
         uint32_t status, l2_err, memio_err;
 
         /* Destructive read, clears register and interrupt */
         status = csr_in32(IOADDR(A_SCD_BUS_ERR_STATUS));
         /* Bit 31 is always on, but there's no #define for that */
-        if (status & ~(1UL << 31)) {  
+        if (status & ~(1UL << 31)) {
                 l2_err = csr_in32(IOADDR(A_BUS_L2_ERRORS));
                 memio_err = csr_in32(IOADDR(A_BUS_MEM_IO_ERRORS));
                 prom_printf("Bus watcher error counters: %08x %08x\n", l2_err, memio_err);
@@ -153,14 +153,14 @@ static void check_bus_watcher(void)
                        (int)(G_SCD_BERR_TID(status) >> 6),
                        (int)G_SCD_BERR_RID(status),
                        (int)G_SCD_BERR_DCODE(status));
-        } else {                
-                prom_printf("Bus watcher indicates no error\n"); 
-        }                       
-}                                       
-#else                                                    
-extern void check_bus_watcher(void);    
-#endif                                          
-                                
+        } else {
+                prom_printf("Bus watcher indicates no error\n");
+        }
+}
+#else
+extern void check_bus_watcher(void);
+#endif
+
 asmlinkage void sb1_cache_error(void)
 {
         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,
 
         for (i = 0; i < nents; i++, sg++) {
                 unsigned long addr;
- 
+
                 addr = (unsigned long) page_address(sg->page);
                 if (addr)
                         __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,
         size_t size, enum dma_data_direction direction)
 {
         unsigned long addr;
- 
+
         BUG_ON(direction == DMA_NONE);
- 
+
         addr = dma_handle + PAGE_OFFSET;
         __dma_sync(addr, size, direction);
 }
@@ -282,9 +282,9 @@ void dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg, int nelems,
         enum dma_data_direction direction)
 {
         int i;
- 
+
         BUG_ON(direction == DMA_NONE);
- 
+
         /* Make sure that gcc doesn't leave the empty loop body.  */
         for (i = 0; i < nelems; i++, sg++)
                 __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)
 
 /*
  * Pad descriptors to cacheline, since each is exclusively owned by a
- * particular CPU. 
+ * particular CPU.
  */
 typedef struct dmadscr_s {
         u64 dscr_a;