|
@@ -114,10 +114,10 @@ static inline unsigned long ffz(unsigned long word)
|
|
|
* @nr: the bit to set
|
|
|
* @addr: the address to start counting from
|
|
|
*/
|
|
|
-static inline void set_bit(int nr, volatile unsigned long *addr)
|
|
|
+static inline void set_bit(int nr, unsigned long *addr)
|
|
|
{
|
|
|
unsigned long mask = BIT_MASK(nr);
|
|
|
- unsigned long *p = ((unsigned long *)addr) + BIT_WORD(nr);
|
|
|
+ unsigned long *p = addr + BIT_WORD(nr);
|
|
|
|
|
|
*p |= mask;
|
|
|
}
|
|
@@ -127,10 +127,10 @@ static inline void set_bit(int nr, volatile unsigned long *addr)
|
|
|
* @nr: Bit to clear
|
|
|
* @addr: Address to start counting from
|
|
|
*/
|
|
|
-static inline void clear_bit(int nr, volatile unsigned long *addr)
|
|
|
+static inline void clear_bit(int nr, unsigned long *addr)
|
|
|
{
|
|
|
unsigned long mask = BIT_MASK(nr);
|
|
|
- unsigned long *p = ((unsigned long *)addr) + BIT_WORD(nr);
|
|
|
+ unsigned long *p = addr + BIT_WORD(nr);
|
|
|
|
|
|
*p &= ~mask;
|
|
|
}
|
|
@@ -140,10 +140,10 @@ static inline void clear_bit(int nr, volatile unsigned long *addr)
|
|
|
* @nr: Bit to change
|
|
|
* @addr: Address to start counting from
|
|
|
*/
|
|
|
-static inline void change_bit(int nr, volatile unsigned long *addr)
|
|
|
+static inline void change_bit(int nr, unsigned long *addr)
|
|
|
{
|
|
|
unsigned long mask = BIT_MASK(nr);
|
|
|
- unsigned long *p = ((unsigned long *)addr) + BIT_WORD(nr);
|
|
|
+ unsigned long *p = addr + BIT_WORD(nr);
|
|
|
|
|
|
*p ^= mask;
|
|
|
}
|
|
@@ -153,10 +153,10 @@ static inline void change_bit(int nr, volatile unsigned long *addr)
|
|
|
* @nr: Bit to set
|
|
|
* @addr: Address to count from
|
|
|
*/
|
|
|
-static inline int test_and_set_bit(int nr, volatile unsigned long *addr)
|
|
|
+static inline int test_and_set_bit(int nr, unsigned long *addr)
|
|
|
{
|
|
|
unsigned long mask = BIT_MASK(nr);
|
|
|
- unsigned long *p = ((unsigned long *)addr) + BIT_WORD(nr);
|
|
|
+ unsigned long *p = addr + BIT_WORD(nr);
|
|
|
unsigned long old = *p;
|
|
|
|
|
|
*p = old | mask;
|
|
@@ -168,10 +168,10 @@ static inline int test_and_set_bit(int nr, volatile unsigned long *addr)
|
|
|
* @nr: Bit to clear
|
|
|
* @addr: Address to count from
|
|
|
*/
|
|
|
-static inline int test_and_clear_bit(int nr, volatile unsigned long *addr)
|
|
|
+static inline int test_and_clear_bit(int nr, unsigned long *addr)
|
|
|
{
|
|
|
unsigned long mask = BIT_MASK(nr);
|
|
|
- unsigned long *p = ((unsigned long *)addr) + BIT_WORD(nr);
|
|
|
+ unsigned long *p = addr + BIT_WORD(nr);
|
|
|
unsigned long old = *p;
|
|
|
|
|
|
*p = old & ~mask;
|
|
@@ -183,10 +183,10 @@ static inline int test_and_clear_bit(int nr, volatile unsigned long *addr)
|
|
|
* @nr: Bit to change
|
|
|
* @addr: Address to count from
|
|
|
*/
|
|
|
-static inline int test_and_change_bit(int nr, volatile unsigned long *addr)
|
|
|
+static inline int test_and_change_bit(int nr, unsigned long *addr)
|
|
|
{
|
|
|
unsigned long mask = BIT_MASK(nr);
|
|
|
- unsigned long *p = ((unsigned long *)addr) + BIT_WORD(nr);
|
|
|
+ unsigned long *p = addr + BIT_WORD(nr);
|
|
|
unsigned long old = *p;
|
|
|
|
|
|
*p = old ^ mask;
|
|
@@ -198,7 +198,7 @@ static inline int test_and_change_bit(int nr, volatile unsigned long *addr)
|
|
|
* @nr: bit number to test
|
|
|
* @addr: Address to start counting from
|
|
|
*/
|
|
|
-static inline int test_bit(int nr, const volatile unsigned long *addr)
|
|
|
+static inline int test_bit(int nr, const unsigned long *addr)
|
|
|
{
|
|
|
return 1UL & (addr[BIT_WORD(nr)] >> (nr & (BITS_PER_LONG-1)));
|
|
|
}
|