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>

11 files changed, 47 insertions, 47 deletions

diff --git a/arch/mips/mti-malta/malta-amon.c b/arch/mips/mti-malta/malta-amon.c
index 469d9b0cee6d..1e4784458016 100644
--- a/arch/mips/mti-malta/malta-amon.c
+++ b/arch/mips/mti-malta/malta-amon.c
@@ -70,12 +70,12 @@ void amon_cpu_start(int cpu,
         launch->sp = sp;
         launch->a0 = a0;
 
-        smp_wmb();              /* Target must see parameters before go */
+        smp_wmb();              /* Target must see parameters before go */
         launch->flags |= LAUNCH_FGO;
-        smp_wmb();              /* Target must see go before we poll  */
+        smp_wmb();              /* Target must see go before we poll  */
 
         while ((launch->flags & LAUNCH_FGONE) == 0)
                 ;
-        smp_rmb();      /* Target will be updating flags soon */
+        smp_rmb();      /* Target will be updating flags soon */
         pr_debug("launch: cpu%d gone!\n", cpu);
 }
diff --git a/arch/mips/mti-malta/malta-cmdline.c b/arch/mips/mti-malta/malta-cmdline.c
index 1871c30ed2eb..5576a306a145 100644
--- a/arch/mips/mti-malta/malta-cmdline.c
+++ b/arch/mips/mti-malta/malta-cmdline.c
@@ -46,7 +46,7 @@ void  __init prom_init_cmdline(void)
 
         cp = &(arcs_cmdline[0]);
         while(actr < prom_argc) {
-                strcpy(cp, prom_argv(actr));
+                strcpy(cp, prom_argv(actr));
                 cp += strlen(prom_argv(actr));
                 *cp++ = ' ';
                 actr++;
diff --git a/arch/mips/mti-malta/malta-display.c b/arch/mips/mti-malta/malta-display.c
index 7c8828fcb0ad..9bc58a24e80a 100644
--- a/arch/mips/mti-malta/malta-display.c
+++ b/arch/mips/mti-malta/malta-display.c
@@ -37,10 +37,10 @@ void mips_display_message(const char *str)
                 display = ioremap(ASCII_DISPLAY_POS_BASE, 16*sizeof(int));
 
         for (i = 0; i <= 14; i=i+2) {
-                 if (*str)
-                         __raw_writel(*str++, display + i);
+                 if (*str)
+                         __raw_writel(*str++, display + i);
                  else
-                         __raw_writel(' ', display + i);
+                         __raw_writel(' ', display + i);
         }
 }
 
diff --git a/arch/mips/mti-malta/malta-init.c b/arch/mips/mti-malta/malta-init.c
index 27a6cdb36e37..c2cbce9e435e 100644
--- a/arch/mips/mti-malta/malta-init.c
+++ b/arch/mips/mti-malta/malta-init.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1999, 2000, 2004, 2005  MIPS Technologies, Inc.
+ * Copyright (C) 1999, 2000, 2004, 2005  MIPS Technologies, Inc.
  *      All rights reserved.
  *      Authors: Carsten Langgaard <carstenl@mips.com>
  *               Maciej W. Rozycki <macro@mips.com>
@@ -110,20 +110,20 @@ static inline void str2eaddr(unsigned char *ea, unsigned char *str)
 
 int get_ethernet_addr(char *ethernet_addr)
 {
-        char *ethaddr_str;
+        char *ethaddr_str;
 
-        ethaddr_str = prom_getenv("ethaddr");
+        ethaddr_str = prom_getenv("ethaddr");
         if (!ethaddr_str) {
-                printk("ethaddr not set in boot prom\n");
+                printk("ethaddr not set in boot prom\n");
                 return -1;
         }
         str2eaddr(ethernet_addr, ethaddr_str);
 
         if (init_debug > 1) {
-                int i;
+                int i;
                 printk("get_ethernet_addr: ");
-                for (i=0; i<5; i++)
-                        printk("%02x:", (unsigned char)*(ethernet_addr+i));
+                for (i=0; i<5; i++)
+                        printk("%02x:", (unsigned char)*(ethernet_addr+i));
                 printk("%02x\n", *(ethernet_addr+i));
         }
 
diff --git a/arch/mips/mti-malta/malta-int.c b/arch/mips/mti-malta/malta-int.c
index 647b86383184..e364af70e6cf 100644
--- a/arch/mips/mti-malta/malta-int.c
+++ b/arch/mips/mti-malta/malta-int.c
@@ -84,10 +84,10 @@ static inline int mips_pcibios_iack(void)
 
                 /* Flush Bonito register block */
                 (void) BONITO_PCIMAP_CFG;
-                iob();    /* sync */
+                iob();    /* sync */
 
                 irq = __raw_readl((u32 *)_pcictrl_bonito_pcicfg);
-                iob();    /* sync */
+                iob();    /* sync */
                 irq &= 0xff;
                 BONITO_PCIMAP_CFG = 0;
                 break;
@@ -136,7 +136,7 @@ static void malta_ipi_irqdispatch(void)
 
         irq = gic_get_int();
         if (irq < 0)
-                return;  /* interrupt has already been cleared */
+                return;  /* interrupt has already been cleared */
 
         do_IRQ(MIPS_GIC_IRQ_BASE + irq);
 }
@@ -149,7 +149,7 @@ static void corehi_irqdispatch(void)
         struct pt_regs *regs = get_irq_regs();
 
         printk(KERN_EMERG "CoreHI interrupt, shouldn't happen, we die here!\n");
-        printk(KERN_EMERG "epc   : %08lx\nStatus: %08lx\n"
+        printk(KERN_EMERG "epc   : %08lx\nStatus: %08lx\n"
                         "Cause : %08lx\nbadVaddr : %08lx\n",
                         regs->cp0_epc, regs->cp0_status,
                         regs->cp0_cause, regs->cp0_badvaddr);
@@ -249,20 +249,20 @@ static inline unsigned int irq_ffs(unsigned int pending)
  * on hardware interrupt 0 (MIPS IRQ 2)) like:
  *
  *      MIPS IRQ        Source
- *      --------        ------
- *             0        Software (ignored)
- *             1        Software (ignored)
- *             2        Combined hardware interrupt (hw0)
- *             3        Hardware (ignored)
- *             4        Hardware (ignored)
- *             5        Hardware (ignored)
- *             6        Hardware (ignored)
- *             7        R4k timer (what we use)
+ *      --------        ------
+ *             0        Software (ignored)
+ *             1        Software (ignored)
+ *             2        Combined hardware interrupt (hw0)
+ *             3        Hardware (ignored)
+ *             4        Hardware (ignored)
+ *             5        Hardware (ignored)
+ *             6        Hardware (ignored)
+ *             7        R4k timer (what we use)
  *
  * We handle the IRQ according to _our_ priority which is:
  *
- * Highest ----     R4k Timer
- * Lowest  ----     Combined hardware interrupt
+ * Highest ----     R4k Timer
+ * Lowest  ----     Combined hardware interrupt
  *
  * then we just return, if multiple IRQs are pending then we will just take
  * another exception, big deal.
@@ -396,7 +396,7 @@ static int __initdata msc_nr_eicirqs = ARRAY_SIZE(msc_eicirqmap);
 
 static struct gic_intr_map gic_intr_map[GIC_NUM_INTRS] = {
         { X, X,            X,           X,              0 },
-        { X, X,            X,           X,              0 },
+        { X, X,            X,           X,              0 },
         { X, X,            X,           X,              0 },
         { 0, GIC_CPU_INT0, GIC_POL_POS, GIC_TRIG_LEVEL, GIC_FLAG_TRANSPARENT },
         { 0, GIC_CPU_INT1, GIC_POL_POS, GIC_TRIG_LEVEL, GIC_FLAG_TRANSPARENT },
@@ -410,7 +410,7 @@ static struct gic_intr_map gic_intr_map[GIC_NUM_INTRS] = {
         { 0, GIC_CPU_INT3, GIC_POL_POS, GIC_TRIG_LEVEL, GIC_FLAG_TRANSPARENT },
         { 0, GIC_CPU_NMI,  GIC_POL_POS, GIC_TRIG_LEVEL, GIC_FLAG_TRANSPARENT },
         { 0, GIC_CPU_NMI,  GIC_POL_POS, GIC_TRIG_LEVEL, GIC_FLAG_TRANSPARENT },
-        { X, X,            X,           X,              0 },
+        { X, X,            X,           X,              0 },
         /* The remainder of this table is initialised by fill_ipi_map */
 };
 #undef X
@@ -634,7 +634,7 @@ void malta_be_init(void)
 
 static char *tr[8] = {
         "mem",  "gcr",  "gic",  "mmio",
-        "0x04", "0x05", "0x06", "0x07"
+        "0x04", "0x05", "0x06", "0x07"
 };
 
 static char *mcmd[32] = {
@@ -673,10 +673,10 @@ static char *mcmd[32] = {
 };
 
 static char *core[8] = {
-        "Invalid/OK",   "Invalid/Data",
+        "Invalid/OK",   "Invalid/Data",
         "Shared/OK",    "Shared/Data",
         "Modified/OK",  "Modified/Data",
-        "Exclusive/OK", "Exclusive/Data"
+        "Exclusive/OK", "Exclusive/Data"
 };
 
 static char *causes[32] = {
diff --git a/arch/mips/mti-malta/malta-memory.c b/arch/mips/mti-malta/malta-memory.c
index a96d281f9221..f3d43aa023a9 100644
--- a/arch/mips/mti-malta/malta-memory.c
+++ b/arch/mips/mti-malta/malta-memory.c
@@ -47,7 +47,7 @@ static char *mtypes[3] = {
 };
 #endif
 
-/* determined physical memory size, not overridden by command line args  */
+/* determined physical memory size, not overridden by command line args  */
 unsigned long physical_memsize = 0L;
 
 static struct prom_pmemblock * __init prom_getmdesc(void)
@@ -158,7 +158,7 @@ void __init prom_meminit(void)
                 size = p->size;
 
                 add_memory_region(base, size, type);
-                p++;
+                p++;
         }
 }
 
diff --git a/arch/mips/mti-malta/malta-pci.c b/arch/mips/mti-malta/malta-pci.c
index 2147cb34e705..37134ddfeaa5 100644
--- a/arch/mips/mti-malta/malta-pci.c
+++ b/arch/mips/mti-malta/malta-pci.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1999, 2000, 2004, 2005  MIPS Technologies, Inc.
+ * Copyright (C) 1999, 2000, 2004, 2005  MIPS Technologies, Inc.
  *      All rights reserved.
  *      Authors: Carsten Langgaard <carstenl@mips.com>
  *               Maciej W. Rozycki <macro@mips.com>
@@ -127,7 +127,7 @@ void __init mips_pcibios_init(void)
                         map = map1;
                 }
                 mask = ~(start ^ end);
-                /* We don't support remapping with a discontiguous mask.  */
+                /* We don't support remapping with a discontiguous mask.  */
                 BUG_ON((start & GT_PCI_HD_MSK) != (map & GT_PCI_HD_MSK) &&
                        mask != ~((mask & -mask) - 1));
                 gt64120_mem_resource.start = start;
@@ -144,7 +144,7 @@ void __init mips_pcibios_init(void)
                 map = GT_READ(GT_PCI0IOREMAP_OFS);
                 end = (end & GT_PCI_HD_MSK) | (start & ~GT_PCI_HD_MSK);
                 mask = ~(start ^ end);
-                /* We don't support remapping with a discontiguous mask.  */
+                /* We don't support remapping with a discontiguous mask.  */
                 BUG_ON((start & GT_PCI_HD_MSK) != (map & GT_PCI_HD_MSK) &&
                        mask != ~((mask & -mask) - 1));
                 gt64120_io_resource.start = map & mask;
diff --git a/arch/mips/mti-malta/malta-platform.c b/arch/mips/mti-malta/malta-platform.c
index 74732177851c..132f8663825e 100644
--- a/arch/mips/mti-malta/malta-platform.c
+++ b/arch/mips/mti-malta/malta-platform.c
@@ -93,7 +93,7 @@ static struct mtd_partition malta_mtd_partitions[] = {
                 .mask_flags =   MTD_WRITEABLE
         }, {
                 .name =         "User FS",
-                .offset =       0x100000,
+                .offset =       0x100000,
                 .size =         0x2e0000
         }, {
                 .name =         "Board Config",
diff --git a/arch/mips/mti-malta/malta-setup.c b/arch/mips/mti-malta/malta-setup.c
index 2e28f653f66d..200f64df2c9b 100644
--- a/arch/mips/mti-malta/malta-setup.c
+++ b/arch/mips/mti-malta/malta-setup.c
@@ -78,9 +78,9 @@ const char *get_system_type(void)
 }
 
 #if defined(CONFIG_MIPS_MT_SMTC)
-const char display_string[] = "       SMTC LINUX ON MALTA       ";
+const char display_string[] = "       SMTC LINUX ON MALTA       ";
 #else
-const char display_string[] = "        LINUX ON MALTA       ";
+const char display_string[] = "        LINUX ON MALTA       ";
 #endif /* CONFIG_MIPS_MT_SMTC */
 
 #ifdef CONFIG_BLK_DEV_FD
diff --git a/arch/mips/mti-malta/malta-smtc.c b/arch/mips/mti-malta/malta-smtc.c
index 1efc8c394486..becbf47506a5 100644
--- a/arch/mips/mti-malta/malta-smtc.c
+++ b/arch/mips/mti-malta/malta-smtc.c
@@ -126,7 +126,7 @@ int plat_set_irq_affinity(struct irq_data *d, const struct cpumask *affinity,
          * to the CPU daughterboard, and on the CoreFPGA2/3 34K models,
          * that signal is brought to IP2 of both VPEs. To avoid racing
          * concurrent interrupt service events, IP2 is enabled only on
-         * one VPE, by convention VPE0.  So long as no bits are ever
+         * one VPE, by convention VPE0.  So long as no bits are ever
          * cleared in the affinity mask, there will never be any
          * interrupt forwarding.  But as soon as a program or operator
          * sets affinity for one of the related IRQs, we need to make
diff --git a/arch/mips/mti-malta/malta-time.c b/arch/mips/mti-malta/malta-time.c
index 115f5bc06003..8607b0dd29f6 100644
--- a/arch/mips/mti-malta/malta-time.c
+++ b/arch/mips/mti-malta/malta-time.c
@@ -95,7 +95,7 @@ static unsigned int __init estimate_cpu_frequency(void)
             (prid != (PRID_COMP_MIPS | PRID_IMP_25KF)))
                 count *= 2;
 
-        count += 5000;    /* round */
+        count += 5000;    /* round */
         count -= count%10000;
 
         return count;
@@ -146,15 +146,15 @@ void __init plat_time_init(void)
 {
         unsigned int est_freq;
 
-        /* Set Data mode - binary. */
-        CMOS_WRITE(CMOS_READ(RTC_CONTROL) | RTC_DM_BINARY, RTC_CONTROL);
+        /* Set Data mode - binary. */
+        CMOS_WRITE(CMOS_READ(RTC_CONTROL) | RTC_DM_BINARY, RTC_CONTROL);
 
         est_freq = estimate_cpu_frequency();
 
         printk("CPU frequency %d.%02d MHz\n", est_freq/1000000,
                (est_freq%1000000)*100/1000000);
 
-        cpu_khz = est_freq / 1000;
+        cpu_khz = est_freq / 1000;
 
         mips_scroll_message();
 #ifdef CONFIG_I8253             /* Only Malta has a PIT */