Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[linux-2.6-omap-h63xx.git] / include / asm-mips / bitops.h

diff --git a/include/asm-mips/bitops.h b/include/asm-mips/bitops.h
index 148bc79557f12b94f22b4669d7a3a6d344f24b12..899357a72ac4e15faab61c77a89ae20e34e9dcc5 100644 (file)
--- a/include/asm-mips/bitops.h
+++ b/include/asm-mips/bitops.h
@@ -19,14 +19,14 @@
 #include <asm/sgidefs.h>
 #include <asm/war.h>
 
-#if (_MIPS_SZLONG == 32)
+#if _MIPS_SZLONG == 32
 #define SZLONG_LOG 5
 #define SZLONG_MASK 31UL
 #define __LL           "ll     "
 #define __SC           "sc     "
 #define __INS          "ins    "
 #define __EXT          "ext    "
-#elif (_MIPS_SZLONG == 64)
+#elif _MIPS_SZLONG == 64
 #define SZLONG_LOG 6
 #define SZLONG_MASK 63UL
 #define __LL           "lld    "
@@ -461,7 +461,7 @@ static inline int __ilog2(unsigned long x)
        int lz;
 
        if (sizeof(x) == 4) {
-               __asm__ (
+               __asm__(
                "       .set    push                                    \n"
                "       .set    mips32                                  \n"
                "       clz     %0, %1                                  \n"
@@ -474,7 +474,7 @@ static inline int __ilog2(unsigned long x)
 
        BUG_ON(sizeof(x) != 8);
 
-       __asm__ (
+       __asm__(
        "       .set    push                                            \n"
        "       .set    mips64                                          \n"
        "       dclz    %0, %1                                          \n"
@@ -508,7 +508,7 @@ static inline unsigned long __ffs(unsigned long word)
  */
 static inline int fls(int word)
 {
-       __asm__ ("clz %0, %1" : "=r" (word) : "r" (word));
+       __asm__("clz %0, %1" : "=r" (word) : "r" (word));
 
        return 32 - word;
 }
@@ -516,7 +516,7 @@ static inline int fls(int word)
 #if defined(CONFIG_64BIT) && defined(CONFIG_CPU_MIPS64)
 static inline int fls64(__u64 word)
 {
-       __asm__ ("dclz %0, %1" : "=r" (word) : "r" (word));
+       __asm__("dclz %0, %1" : "=r" (word) : "r" (word));
 
        return 64 - word;
 }