4 files changed, 28 insertions, 28 deletions

diff --git a/include/asm-mips/sn/addrs.h b/include/asm-mips/sn/addrs.h
index 8fa0af6b68d2..6aa086868249 100644
--- a/include/asm-mips/sn/addrs.h
+++ b/include/asm-mips/sn/addrs.h
@@ -50,7 +50,7 @@
 #define TO_NODE_ADDRSPACE(_pa)  (UINT64_CAST (_pa) & NODE_ADDRSPACE_MASK)
 
 #define CHANGE_ADDR_NASID(_pa, _nasid)  \
-                ((UINT64_CAST (_pa) & ~NASID_MASK) | \
+                ((UINT64_CAST(_pa) & ~NASID_MASK) | \
                  (UINT64_CAST(_nasid) <<  NASID_SHFT))
 
 
@@ -75,7 +75,7 @@
 
 
 #define RAW_NODE_SWIN_BASE(nasid, widget)                               \
-        (NODE_IO_BASE(nasid) + (UINT64_CAST (widget) << SWIN_SIZE_BITS))
+        (NODE_IO_BASE(nasid) + (UINT64_CAST(widget) << SWIN_SIZE_BITS))
 
 #define WIDGETID_GET(addr)      ((unsigned char)((addr >> SWIN_SIZE_BITS) & 0xff))
 
@@ -192,21 +192,21 @@
 #define BDDIR_ENTRY_LO(_pa)     ((HSPEC_BASE +                                \
                                   NODE_ADDRSPACE_SIZE * 3 / 4 +               \
                                   0x200)                                    | \
-                                 UINT64_CAST (_pa)       & NASID_MASK       | \
-                                 UINT64_CAST (_pa) >> 2 & BDDIR_UPPER_MASK  | \
-                                 UINT64_CAST (_pa) >> 3 & 0x1f << 4)
+                                 UINT64_CAST(_pa)        & NASID_MASK       | \
+                                 UINT64_CAST(_pa) >> 2 & BDDIR_UPPER_MASK  | \
+                                 UINT64_CAST(_pa) >> 3 & 0x1f << 4)
 
 #define BDDIR_ENTRY_HI(_pa)     ((HSPEC_BASE +                                \
                                   NODE_ADDRSPACE_SIZE * 3 / 4 +               \
                                   0x208)                                    | \
-                                 UINT64_CAST (_pa)       & NASID_MASK       | \
-                                 UINT64_CAST (_pa) >> 2 & BDDIR_UPPER_MASK  | \
-                                 UINT64_CAST (_pa) >> 3 & 0x1f << 4)
+                                 UINT64_CAST(_pa)        & NASID_MASK       | \
+                                 UINT64_CAST(_pa) >> 2 & BDDIR_UPPER_MASK  | \
+                                 UINT64_CAST(_pa) >> 3 & 0x1f << 4)
 
 #define BDPRT_ENTRY(_pa, _rgn)  ((HSPEC_BASE +                                \
                                   NODE_ADDRSPACE_SIZE * 3 / 4)              | \
-                                 UINT64_CAST (_pa)       & NASID_MASK       | \
-                                 UINT64_CAST (_pa) >> 2 & BDDIR_UPPER_MASK  | \
+                                 UINT64_CAST(_pa)        & NASID_MASK       | \
+                                 UINT64_CAST(_pa) >> 2 & BDDIR_UPPER_MASK  | \
                                  (_rgn) << 3)
 #define BDPRT_ENTRY_ADDR(_pa,_rgn) (BDPRT_ENTRY((_pa),(_rgn)))
 #define BDPRT_ENTRY_S(_pa,_rgn,_val) (*(__psunsigned_t *)BDPRT_ENTRY((_pa),(_rgn))=(_val))
@@ -214,9 +214,9 @@
 
 #define BDECC_ENTRY(_pa)        ((HSPEC_BASE +                                \
                                   NODE_ADDRSPACE_SIZE / 2)                  | \
-                                 UINT64_CAST (_pa)       & NASID_MASK       | \
-                                 UINT64_CAST (_pa) >> 2 & BDECC_UPPER_MASK  | \
-                                 UINT64_CAST (_pa) >> 3 & 3)
+                                 UINT64_CAST(_pa)        & NASID_MASK       | \
+                                 UINT64_CAST(_pa) >> 2 & BDECC_UPPER_MASK  | \
+                                 UINT64_CAST(_pa) >> 3 & 3)
 
 /*
  * Macro to convert a back door directory or protection address into the
@@ -225,16 +225,16 @@
 #define BDADDR_IS_DIR(_ba)      ((UINT64_CAST  (_ba) & 0x200) != 0)
 #define BDADDR_IS_PRT(_ba)      ((UINT64_CAST  (_ba) & 0x200) == 0)
 
-#define BDDIR_TO_MEM(_ba)       (UINT64_CAST  (_ba) & NASID_MASK            | \
-                                 (UINT64_CAST (_ba) & BDDIR_UPPER_MASK)<<2  | \
-                                 (UINT64_CAST (_ba) & 0x1f << 4) << 3)
+#define BDDIR_TO_MEM(_ba)       (UINT64_CAST (_ba) & NASID_MASK            | \
+                                 (UINT64_CAST(_ba) & BDDIR_UPPER_MASK)<<2  | \
+                                 (UINT64_CAST(_ba) & 0x1f << 4) << 3)
 
-#define BDPRT_TO_MEM(_ba)       (UINT64_CAST  (_ba) & NASID_MASK            | \
-                                 (UINT64_CAST (_ba) & BDDIR_UPPER_MASK)<<2)
+#define BDPRT_TO_MEM(_ba)       (UINT64_CAST (_ba) & NASID_MASK     | \
+                                 (UINT64_CAST(_ba) & BDDIR_UPPER_MASK)<<2)
 
-#define BDECC_TO_MEM(_ba)       (UINT64_CAST  (_ba) & NASID_MASK            | \
-                                 (UINT64_CAST (_ba) & BDECC_UPPER_MASK)<<2  | \
-                                 (UINT64_CAST (_ba) & 3) << 3)
+#define BDECC_TO_MEM(_ba)       (UINT64_CAST (_ba) & NASID_MASK     | \
+                                 (UINT64_CAST(_ba) & BDECC_UPPER_MASK)<<2  | \
+                                 (UINT64_CAST(_ba) & 3) << 3)
 #endif /* CONFIG_SGI_IP27 */
 
 
@@ -282,7 +282,7 @@
  * the base of the register space.
  */
 #define HUB_REG_PTR(_base, _off)        \
-        (HUBREG_CAST ((__psunsigned_t)(_base) + (__psunsigned_t)(_off)))
+        (HUBREG_CAST((__psunsigned_t)(_base) + (__psunsigned_t)(_off)))
 
 #define HUB_REG_PTR_L(_base, _off)      \
         HUB_L(HUB_REG_PTR((_base), (_off)))
diff --git a/include/asm-mips/sn/io.h b/include/asm-mips/sn/io.h
index ab2fa8cd2627..24c6775fbb0f 100644
--- a/include/asm-mips/sn/io.h
+++ b/include/asm-mips/sn/io.h
@@ -9,7 +9,7 @@
 #ifndef _ASM_SN_IO_H
 #define _ASM_SN_IO_H
 
-#if defined (CONFIG_SGI_IP27)
+#if defined(CONFIG_SGI_IP27)
 #include <asm/sn/sn0/hubio.h>
 #endif
 
diff --git a/include/asm-mips/sn/kldir.h b/include/asm-mips/sn/kldir.h
index 0573cbffc104..1327e12e9645 100644
--- a/include/asm-mips/sn/kldir.h
+++ b/include/asm-mips/sn/kldir.h
@@ -140,7 +140,7 @@
  */
 #define SYMMON_STACK_SIZE               0x8000
 
-#if defined (PROM)
+#if defined(PROM)
 
 /*
  * These defines are prom version dependent.  No code other than the IP27
diff --git a/include/asm-mips/sn/sn0/addrs.h b/include/asm-mips/sn/sn0/addrs.h
index 9e8cc52910f6..b06190093bbc 100644
--- a/include/asm-mips/sn/sn0/addrs.h
+++ b/include/asm-mips/sn/sn0/addrs.h
@@ -91,7 +91,7 @@
         : RAW_NODE_SWIN_BASE(nasid, widget))
 #else /* __ASSEMBLY__ */
 #define NODE_SWIN_BASE(nasid, widget) \
-     (NODE_IO_BASE(nasid) + (UINT64_CAST (widget) << SWIN_SIZE_BITS))
+     (NODE_IO_BASE(nasid) + (UINT64_CAST(widget) << SWIN_SIZE_BITS))
 #endif /* __ASSEMBLY__ */
 
 /*
@@ -106,7 +106,7 @@
 #define BWIN_WIDGET_MASK        0x7
 #define NODE_BWIN_BASE0(nasid)  (NODE_IO_BASE(nasid) + BWIN_SIZE)
 #define NODE_BWIN_BASE(nasid, bigwin)   (NODE_BWIN_BASE0(nasid) +       \
-                        (UINT64_CAST (bigwin) << BWIN_SIZE_BITS))
+                        (UINT64_CAST(bigwin) << BWIN_SIZE_BITS))
 
 #define BWIN_WIDGETADDR(addr)   ((addr) & BWIN_SIZEMASK)
 #define BWIN_WINDOWNUM(addr)    (((addr) >> BWIN_SIZE_BITS) & BWIN_WIDGET_MASK)
@@ -259,7 +259,7 @@
  * CACHE_ERR_SP_PTR could either contain an address to the stack, or
  * the stack could start at CACHE_ERR_SP_PTR
  */
-#if defined (HUB_ERR_STS_WAR)
+#if defined(HUB_ERR_STS_WAR)
 #define CACHE_ERR_EFRAME        0x480
 #else /* HUB_ERR_STS_WAR */
 #define CACHE_ERR_EFRAME        0x400
@@ -275,7 +275,7 @@
 
 #define _ARCSPROM
 
-#if defined (HUB_ERR_STS_WAR)
+#if defined(HUB_ERR_STS_WAR)
 
 #define ERR_STS_WAR_REGISTER    IIO_IIBUSERR
 #define ERR_STS_WAR_ADDR        LOCAL_HUB_ADDR(IIO_IIBUSERR)