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>

10 files changed, 29 insertions, 29 deletions

diff --git a/arch/mips/netlogic/Platform b/arch/mips/netlogic/Platform
index cdfc9abbbb7b..fb8eb4c0c6ec 100644
--- a/arch/mips/netlogic/Platform
+++ b/arch/mips/netlogic/Platform
@@ -13,5 +13,5 @@ cflags-$(CONFIG_CPU_XLP)	+= $(call cc-option,-march=xlp,-march=mips64r2)
 #
 # NETLOGIC processor support
 #
-platform-$(CONFIG_NLM_COMMON)   += netlogic/
-load-$(CONFIG_NLM_COMMON)       += 0xffffffff80100000
+platform-$(CONFIG_NLM_COMMON)   += netlogic/
+load-$(CONFIG_NLM_COMMON)       += 0xffffffff80100000
diff --git a/arch/mips/netlogic/common/irq.c b/arch/mips/netlogic/common/irq.c
index 00dcc7a2bc5a..780832e391ff 100644
--- a/arch/mips/netlogic/common/irq.c
+++ b/arch/mips/netlogic/common/irq.c
@@ -69,7 +69,7 @@
 #else
 #define SMP_IRQ_MASK    0
 #endif
-#define PERCPU_IRQ_MASK (SMP_IRQ_MASK | (1ull << IRQ_TIMER) | \
+#define PERCPU_IRQ_MASK (SMP_IRQ_MASK | (1ull << IRQ_TIMER) | \
                                 (1ull << IRQ_FMN))
 
 struct nlm_pic_irq {
@@ -107,7 +107,7 @@ static void xlp_pic_mask_ack(struct irq_data *d)
         struct nlm_pic_irq *pd = irq_data_get_irq_handler_data(d);
         uint64_t mask = 1ull << pd->picirq;
 
-        write_c0_eirr(mask);            /* ack by writing EIRR */
+        write_c0_eirr(mask);            /* ack by writing EIRR */
 }
 
 static void xlp_pic_unmask(struct irq_data *d)
diff --git a/arch/mips/netlogic/common/smpboot.S b/arch/mips/netlogic/common/smpboot.S
index a0b74874bebe..280ff5855ef7 100644
--- a/arch/mips/netlogic/common/smpboot.S
+++ b/arch/mips/netlogic/common/smpboot.S
@@ -49,12 +49,12 @@
 #include <asm/netlogic/xlp-hal/sys.h>
 #include <asm/netlogic/xlp-hal/cpucontrol.h>
 
-#define CP0_EBASE       $15
+#define CP0_EBASE       $15
 #define SYS_CPU_COHERENT_BASE(node)     CKSEG1ADDR(XLP_DEFAULT_IO_BASE) + \
                         XLP_IO_SYS_OFFSET(node) + XLP_IO_PCI_HDRSZ + \
                         SYS_CPU_NONCOHERENT_MODE * 4
 
-#define XLP_AX_WORKAROUND       /* enable Ax silicon workarounds */
+#define XLP_AX_WORKAROUND       /* enable Ax silicon workarounds */
 
 /* Enable XLP features and workarounds in the LSU */
 .macro xlp_config_lsu
@@ -85,7 +85,7 @@
         li      t0, LSU_DEBUG_DATA0
         li      t1, LSU_DEBUG_ADDR
         li      t2, 0           /* index */
-        li      t3, 0x1000      /* loop count */
+        li      t3, 0x1000      /* loop count */
 1:
         sll     v0, t2, 5
         mtcr    zero, t0
@@ -134,7 +134,7 @@ FEXPORT(nlm_reset_entry)
         and     k1, k0, k1
         beqz    k1, 1f          /* go to real reset entry */
         nop
-        li      k1, CKSEG1ADDR(RESET_DATA_PHYS) /* NMI */
+        li      k1, CKSEG1ADDR(RESET_DATA_PHYS) /* NMI */
         ld      k0, BOOT_NMI_HANDLER(k1)
         jr      k0
         nop
@@ -235,7 +235,7 @@ EXPORT(nlm_reset_entry_end)
 
 FEXPORT(xlp_boot_core0_siblings)        /* "Master" cpu starts from here */
         xlp_config_lsu
-        dmtc0   sp, $4, 2               /* SP saved in UserLocal */
+        dmtc0   sp, $4, 2               /* SP saved in UserLocal */
         SAVE_ALL
         sync
         /* find the location to which nlm_boot_siblings was relocated */
@@ -301,13 +301,13 @@ NESTED(nlm_rmiboot_preboot, 16, sp)
          */
         li      t0, 0x400
         mfcr    t1, t0
-        li      t2, 6           /* XLR thread mode mask */
+        li      t2, 6           /* XLR thread mode mask */
         nor     t3, t2, zero
         and     t2, t1, t2      /* t2 - current thread mode */
         li      v0, CKSEG1ADDR(RESET_DATA_PHYS)
         lw      v1, BOOT_THREAD_MODE(v0) /* v1 - new thread mode */
         sll     v1, 1
-        beq     v1, t2, 1f      /* same as request value */
+        beq     v1, t2, 1f      /* same as request value */
         nop                     /* nothing to do */
 
         and     t2, t1, t3      /* mask out old thread mode */
diff --git a/arch/mips/netlogic/dts/xlp_evp.dts b/arch/mips/netlogic/dts/xlp_evp.dts
index e14f42308064..7628b5464fc7 100644
--- a/arch/mips/netlogic/dts/xlp_evp.dts
+++ b/arch/mips/netlogic/dts/xlp_evp.dts
@@ -20,7 +20,7 @@
                 #address-cells = <2>;
                 #size-cells = <1>;
                 compatible = "simple-bus";
-                ranges = <0 0  0 0x18000000  0x04000000   // PCIe CFG
+                ranges = <0 0  0 0x18000000  0x04000000   // PCIe CFG
                           1 0  0 0x16000000  0x01000000>; // GBU chipselects
 
                 serial0: serial@30000 {
diff --git a/arch/mips/netlogic/xlp/nlm_hal.c b/arch/mips/netlogic/xlp/nlm_hal.c
index 529e74742d9f..c68fd4026104 100644
--- a/arch/mips/netlogic/xlp/nlm_hal.c
+++ b/arch/mips/netlogic/xlp/nlm_hal.c
@@ -111,8 +111,8 @@ unsigned int nlm_get_core_frequency(int node, int core)
         dfsval = nlm_read_sys_reg(sysbase, SYS_CORE_DFS_DIV_VALUE);
         pll_divf = ((rstval >> 10) & 0x7f) + 1;
         pll_divr = ((rstval >> 8)  & 0x3) + 1;
-        ext_div  = ((rstval >> 30) & 0x3) + 1;
-        dfs_div  = ((dfsval >> (core * 4)) & 0xf) + 1;
+        ext_div  = ((rstval >> 30) & 0x3) + 1;
+        dfs_div  = ((dfsval >> (core * 4)) & 0xf) + 1;
 
         num = 800000000ULL * pll_divf;
         denom = 3 * pll_divr * ext_div * dfs_div;
diff --git a/arch/mips/netlogic/xlp/usb-init.c b/arch/mips/netlogic/xlp/usb-init.c
index dbe083a93538..1d0b66c62fd1 100644
--- a/arch/mips/netlogic/xlp/usb-init.c
+++ b/arch/mips/netlogic/xlp/usb-init.c
@@ -52,7 +52,7 @@ static void nlm_usb_intr_en(int node, int port)
         port_addr = nlm_get_usb_regbase(node, port);
         val = nlm_read_usb_reg(port_addr, USB_INT_EN);
         val = USB_CTRL_INTERRUPT_EN  | USB_OHCI_INTERRUPT_EN |
-                USB_OHCI_INTERRUPT1_EN | USB_CTRL_INTERRUPT_EN  |
+                USB_OHCI_INTERRUPT1_EN | USB_CTRL_INTERRUPT_EN  |
                 USB_OHCI_INTERRUPT_EN | USB_OHCI_INTERRUPT2_EN;
         nlm_write_usb_reg(port_addr, USB_INT_EN, val);
 }
diff --git a/arch/mips/netlogic/xlr/fmn-config.c b/arch/mips/netlogic/xlr/fmn-config.c
index bed2cffa1008..f5bddf95bf24 100644
--- a/arch/mips/netlogic/xlr/fmn-config.c
+++ b/arch/mips/netlogic/xlr/fmn-config.c
@@ -164,8 +164,8 @@ static void setup_cpu_fmninfo(struct xlr_fmn_info *cpu, int num_core)
         int i, j;
 
         for (i = 0; i < num_core; i++) {
-                cpu[i].start_stn_id     = (8 * i);
-                cpu[i].end_stn_id       = (8 * i + 8);
+                cpu[i].start_stn_id     = (8 * i);
+                cpu[i].end_stn_id       = (8 * i + 8);
 
                 for (j = cpu[i].start_stn_id; j < cpu[i].end_stn_id; j++)
                         xlr_board_fmn_config.bucket_size[j] = 32;
diff --git a/arch/mips/netlogic/xlr/platform-flash.c b/arch/mips/netlogic/xlr/platform-flash.c
index 340ab1601c42..6d3c727e0ef8 100644
--- a/arch/mips/netlogic/xlr/platform-flash.c
+++ b/arch/mips/netlogic/xlr/platform-flash.c
@@ -36,7 +36,7 @@ static struct mtd_partition xlr_nor_parts[] = {
         {
                 .name = "User FS",
                 .offset = 0x800000,
-                .size   = MTDPART_SIZ_FULL,
+                .size   = MTDPART_SIZ_FULL,
         }
 };
 
@@ -46,13 +46,13 @@ static struct mtd_partition xlr_nor_parts[] = {
 static struct mtd_partition xlr_nand_parts[] = {
         {
                 .name   = "Root Filesystem",
-                .offset = 64 * 64 * 2048,
+                .offset = 64 * 64 * 2048,
                 .size   = 432 * 64 * 2048,
         },
         {
                 .name   = "Home Filesystem",
-                .offset = MTDPART_OFS_APPEND,
-                .size   = MTDPART_SIZ_FULL,
+                .offset = MTDPART_OFS_APPEND,
+                .size   = MTDPART_SIZ_FULL,
         },
 };
 
@@ -74,8 +74,8 @@ static struct platform_device xlr_nor_dev = {
         .dev    = {
                 .platform_data  = &xlr_nor_data,
         },
-        .num_resources  = ARRAY_SIZE(xlr_nor_res),
-        .resource       = xlr_nor_res,
+        .num_resources  = ARRAY_SIZE(xlr_nor_res),
+        .resource       = xlr_nor_res,
 };
 
 const char *xlr_part_probes[] = { "cmdlinepart", NULL };
diff --git a/arch/mips/netlogic/xlr/platform.c b/arch/mips/netlogic/xlr/platform.c
index 507230eeb768..e287277d32b0 100644
--- a/arch/mips/netlogic/xlr/platform.c
+++ b/arch/mips/netlogic/xlr/platform.c
@@ -162,18 +162,18 @@ int xls_platform_usb_init(void)
         nlm_write_reg(usb_mmio, 50, 0x1f000000);
 
         /* Enable ports */
-        nlm_write_reg(usb_mmio,  1, 0x07000500);
+        nlm_write_reg(usb_mmio,  1, 0x07000500);
 
         val = nlm_read_reg(gpio_mmio, 21);
         if (((val >> 22) & 0x01) == 0) {
                 pr_info("Detected USB Device mode - Not supported!\n");
-                nlm_write_reg(usb_mmio,  0, 0x01000000);
+                nlm_write_reg(usb_mmio,  0, 0x01000000);
                 return 0;
         }
 
         pr_info("Detected USB Host mode - Adding XLS USB devices.\n");
         /* Clear reset, host mode */
-        nlm_write_reg(usb_mmio,  0, 0x02000000);
+        nlm_write_reg(usb_mmio,  0, 0x02000000);
 
         /* Memory resource for various XLS usb ports */
         usb_mmio = nlm_mmio_base(NETLOGIC_IO_USB_0_OFFSET);
@@ -221,8 +221,8 @@ static struct resource i2c_resources[] = {
 };
 
 static struct platform_device nlm_xlr_i2c_1 = {
-        .name           = "xlr-i2cbus",
-        .id             = 1,
+        .name           = "xlr-i2cbus",
+        .id             = 1,
         .num_resources  = 1,
         .resource       = i2c_resources,
 };
diff --git a/arch/mips/netlogic/xlr/setup.c b/arch/mips/netlogic/xlr/setup.c
index c5ce6992ac4c..f088efb8fe4c 100644
--- a/arch/mips/netlogic/xlr/setup.c
+++ b/arch/mips/netlogic/xlr/setup.c
@@ -163,7 +163,7 @@ static void prom_add_memory(void)
 {
         struct nlm_boot_mem_map *bootm;
         u64 start, size;
-        u64 pref_backup = 512;  /* avoid pref walking beyond end */
+        u64 pref_backup = 512;  /* avoid pref walking beyond end */
         int i;
 
         bootm = (void *)(long)nlm_prom_info.psb_mem_map;