Skip to content

Commit

Permalink
include/asm-x86/bitops.h: checkpatch cleanups - formatting only
Browse files Browse the repository at this point in the history
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Joe Perches authored and Ingo Molnar committed Apr 17, 2008
1 parent 49f7494 commit 286275c
Showing 1 changed file with 13 additions and 24 deletions.
37 changes: 13 additions & 24 deletions include/asm-x86/bitops.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@
#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 1)
/* Technically wrong, but this avoids compilation errors on some gcc
versions. */
#define ADDR "=m" (*(volatile long *) addr)
#define BIT_ADDR "=m" (((volatile int *) addr)[nr >> 5])
#define ADDR "=m" (*(volatile long *)addr)
#define BIT_ADDR "=m" (((volatile int *)addr)[nr >> 5])
#else
#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
#define BASE_ADDR "m" (*(volatile int *) addr)
#define BASE_ADDR "m" (*(volatile int *)addr)

/**
* set_bit - Atomically set a bit in memory
Expand All @@ -48,9 +48,7 @@
*/
static inline void set_bit(int nr, volatile void *addr)
{
asm volatile(LOCK_PREFIX "bts %1,%0"
: ADDR
: "Ir" (nr) : "memory");
asm volatile(LOCK_PREFIX "bts %1,%0" : ADDR : "Ir" (nr) : "memory");
}

/**
Expand Down Expand Up @@ -82,8 +80,7 @@ static inline void __set_bit(int nr, volatile void *addr)
*/
static inline void clear_bit(int nr, volatile void *addr)
{
asm volatile(LOCK_PREFIX "btr %1,%2"
: BIT_ADDR : "Ir" (nr), BASE_ADDR);
asm volatile(LOCK_PREFIX "btr %1,%2" : BIT_ADDR : "Ir" (nr), BASE_ADDR);
}

/*
Expand Down Expand Up @@ -151,8 +148,7 @@ 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"
: BIT_ADDR : "Ir" (nr), BASE_ADDR);
asm volatile(LOCK_PREFIX "btc %1,%2" : BIT_ADDR : "Ir" (nr), BASE_ADDR);
}

/**
Expand All @@ -168,9 +164,7 @@ static inline int test_and_set_bit(int nr, volatile void *addr)
int oldbit;

asm volatile(LOCK_PREFIX "bts %2,%1\n\t"
"sbb %0,%0"
: "=r" (oldbit), ADDR
: "Ir" (nr) : "memory");
"sbb %0,%0" : "=r" (oldbit), ADDR : "Ir" (nr) : "memory");

return oldbit;
}
Expand Down Expand Up @@ -202,8 +196,7 @@ static inline int __test_and_set_bit(int nr, volatile void *addr)

asm volatile("bts %2,%3\n\t"
"sbb %0,%0"
: "=r" (oldbit), BIT_ADDR
: "Ir" (nr), BASE_ADDR);
: "=r" (oldbit), BIT_ADDR : "Ir" (nr), BASE_ADDR);
return oldbit;
}

Expand All @@ -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"
"sbb %0,%0"
: "=r" (oldbit), ADDR
: "Ir" (nr) : "memory");
: "=r" (oldbit), ADDR : "Ir" (nr) : "memory");

return oldbit;
}
Expand All @@ -242,8 +234,7 @@ static inline int __test_and_clear_bit(int nr, volatile void *addr)

asm volatile("btr %2,%3\n\t"
"sbb %0,%0"
: "=r" (oldbit), BIT_ADDR
: "Ir" (nr), BASE_ADDR);
: "=r" (oldbit), BIT_ADDR : "Ir" (nr), BASE_ADDR);
return oldbit;
}

Expand All @@ -254,8 +245,7 @@ static inline int __test_and_change_bit(int nr, volatile void *addr)

asm volatile("btc %2,%3\n\t"
"sbb %0,%0"
: "=r" (oldbit), BIT_ADDR
: "Ir" (nr), BASE_ADDR);
: "=r" (oldbit), BIT_ADDR : "Ir" (nr), BASE_ADDR);

return oldbit;
}
Expand All @@ -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"
"sbb %0,%0"
: "=r" (oldbit), ADDR
: "Ir" (nr) : "memory");
: "=r" (oldbit), ADDR : "Ir" (nr) : "memory");

return oldbit;
}
Expand Down

0 comments on commit 286275c

Please sign in to comment.