Commit 286275c9 authored by Joe Perches's avatar Joe Perches Committed by Ingo Molnar

include/asm-x86/bitops.h: checkpatch cleanups - formatting only

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 49f74946
...@@ -23,13 +23,13 @@ ...@@ -23,13 +23,13 @@
#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 1) #if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 1)
/* Technically wrong, but this avoids compilation errors on some gcc /* Technically wrong, but this avoids compilation errors on some gcc
versions. */ versions. */
#define ADDR "=m" (*(volatile long *) addr) #define ADDR "=m" (*(volatile long *)addr)
#define BIT_ADDR "=m" (((volatile int *) addr)[nr >> 5]) #define BIT_ADDR "=m" (((volatile int *)addr)[nr >> 5])
#else #else
#define ADDR "+m" (*(volatile long *) addr) #define ADDR "+m" (*(volatile long *) addr)
#define BIT_ADDR "+m" (((volatile int *) addr)[nr >> 5]) #define BIT_ADDR "+m" (((volatile int *)addr)[nr >> 5])
#endif #endif
#define BASE_ADDR "m" (*(volatile int *) addr) #define BASE_ADDR "m" (*(volatile int *)addr)
/** /**
* set_bit - Atomically set a bit in memory * set_bit - Atomically set a bit in memory
...@@ -48,9 +48,7 @@ ...@@ -48,9 +48,7 @@
*/ */
static inline void set_bit(int nr, volatile void *addr) static inline void set_bit(int nr, volatile void *addr)
{ {
asm volatile(LOCK_PREFIX "bts %1,%0" asm volatile(LOCK_PREFIX "bts %1,%0" : ADDR : "Ir" (nr) : "memory");
: ADDR
: "Ir" (nr) : "memory");
} }
/** /**
...@@ -82,8 +80,7 @@ static inline void __set_bit(int nr, volatile void *addr) ...@@ -82,8 +80,7 @@ static inline void __set_bit(int nr, volatile void *addr)
*/ */
static inline void clear_bit(int nr, volatile void *addr) static inline void clear_bit(int nr, volatile void *addr)
{ {
asm volatile(LOCK_PREFIX "btr %1,%2" asm volatile(LOCK_PREFIX "btr %1,%2" : BIT_ADDR : "Ir" (nr), BASE_ADDR);
: BIT_ADDR : "Ir" (nr), BASE_ADDR);
} }
/* /*
...@@ -151,8 +148,7 @@ static inline void __change_bit(int nr, volatile void *addr) ...@@ -151,8 +148,7 @@ static inline void __change_bit(int nr, volatile void *addr)
*/ */
static inline void change_bit(int nr, volatile void *addr) static inline void change_bit(int nr, volatile void *addr)
{ {
asm volatile(LOCK_PREFIX "btc %1,%2" asm volatile(LOCK_PREFIX "btc %1,%2" : BIT_ADDR : "Ir" (nr), BASE_ADDR);
: BIT_ADDR : "Ir" (nr), BASE_ADDR);
} }
/** /**
...@@ -168,9 +164,7 @@ static inline int test_and_set_bit(int nr, volatile void *addr) ...@@ -168,9 +164,7 @@ static inline int test_and_set_bit(int nr, volatile void *addr)
int oldbit; int oldbit;
asm volatile(LOCK_PREFIX "bts %2,%1\n\t" asm volatile(LOCK_PREFIX "bts %2,%1\n\t"
"sbb %0,%0" "sbb %0,%0" : "=r" (oldbit), ADDR : "Ir" (nr) : "memory");
: "=r" (oldbit), ADDR
: "Ir" (nr) : "memory");
return oldbit; return oldbit;
} }
...@@ -202,8 +196,7 @@ static inline int __test_and_set_bit(int nr, volatile void *addr) ...@@ -202,8 +196,7 @@ static inline int __test_and_set_bit(int nr, volatile void *addr)
asm volatile("bts %2,%3\n\t" asm volatile("bts %2,%3\n\t"
"sbb %0,%0" "sbb %0,%0"
: "=r" (oldbit), BIT_ADDR : "=r" (oldbit), BIT_ADDR : "Ir" (nr), BASE_ADDR);
: "Ir" (nr), BASE_ADDR);
return oldbit; return oldbit;
} }
...@@ -221,8 +214,7 @@ static inline int test_and_clear_bit(int nr, volatile void *addr) ...@@ -221,8 +214,7 @@ static inline int test_and_clear_bit(int nr, volatile void *addr)
asm volatile(LOCK_PREFIX "btr %2,%1\n\t" asm volatile(LOCK_PREFIX "btr %2,%1\n\t"
"sbb %0,%0" "sbb %0,%0"
: "=r" (oldbit), ADDR : "=r" (oldbit), ADDR : "Ir" (nr) : "memory");
: "Ir" (nr) : "memory");
return oldbit; return oldbit;
} }
...@@ -242,8 +234,7 @@ static inline int __test_and_clear_bit(int nr, volatile void *addr) ...@@ -242,8 +234,7 @@ static inline int __test_and_clear_bit(int nr, volatile void *addr)
asm volatile("btr %2,%3\n\t" asm volatile("btr %2,%3\n\t"
"sbb %0,%0" "sbb %0,%0"
: "=r" (oldbit), BIT_ADDR : "=r" (oldbit), BIT_ADDR : "Ir" (nr), BASE_ADDR);
: "Ir" (nr), BASE_ADDR);
return oldbit; return oldbit;
} }
...@@ -254,8 +245,7 @@ static inline int __test_and_change_bit(int nr, volatile void *addr) ...@@ -254,8 +245,7 @@ static inline int __test_and_change_bit(int nr, volatile void *addr)
asm volatile("btc %2,%3\n\t" asm volatile("btc %2,%3\n\t"
"sbb %0,%0" "sbb %0,%0"
: "=r" (oldbit), BIT_ADDR : "=r" (oldbit), BIT_ADDR : "Ir" (nr), BASE_ADDR);
: "Ir" (nr), BASE_ADDR);
return oldbit; return oldbit;
} }
...@@ -274,8 +264,7 @@ static inline int test_and_change_bit(int nr, volatile void *addr) ...@@ -274,8 +264,7 @@ static inline int test_and_change_bit(int nr, volatile void *addr)
asm volatile(LOCK_PREFIX "btc %2,%1\n\t" asm volatile(LOCK_PREFIX "btc %2,%1\n\t"
"sbb %0,%0" "sbb %0,%0"
: "=r" (oldbit), ADDR : "=r" (oldbit), ADDR : "Ir" (nr) : "memory");
: "Ir" (nr) : "memory");
return oldbit; return oldbit;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment