[PATCH] clean up m68knommu bitops.h

Rework the bitops functions for the m68knommu arhcitecture. Change
all addr pointers to be "unsigned long", cleans up many compiler
warnings.

diff --git a/include/asm-m68knommu/bitops.h b/include/asm-m68knommu/bitops.h
index 351f6fdeae3426c6bdd08472ef6459c420ca0911..18422f15af11cd7e195363501f695eec82b012a3 100644 (file)
--- a/include/asm-m68knommu/bitops.h
+++ b/include/asm-m68knommu/bitops.h
@@ -11,31 +11,6 @@
 #include <asm/system.h>                /* save_flags */
 
 #ifdef __KERNEL__
-/*
- * Function prototypes to keep gcc -Wall happy
- */
-
-/*
- * The __ functions are not atomic
- */
-
-extern void set_bit(int nr, volatile void * addr);
-extern void __set_bit(int nr, volatile void * addr);
-extern void clear_bit(int nr, volatile void * addr);
-extern void __clear_bit(int nr, volatile void * addr);
-extern void change_bit(int nr, volatile void * addr);
-extern void __change_bit(int nr, volatile void * addr);
-extern int test_and_set_bit(int nr, volatile void * addr);
-extern int __test_and_set_bit(int nr, volatile void * addr);
-extern int test_and_clear_bit(int nr, volatile void * addr);
-extern int __test_and_clear_bit(int nr, volatile void * addr);
-extern int test_and_change_bit(int nr, volatile void * addr);
-extern int __test_and_change_bit(int nr, volatile void * addr);
-extern int __constant_test_bit(int nr, const volatile void * addr);
-extern int __test_bit(int nr, volatile void * addr);
-extern int find_first_zero_bit(void * addr, unsigned size);
-extern int find_next_zero_bit (void * addr, int size, int offset);
-
 
 /*
  *     Generic ffs().
@@ -130,7 +105,7 @@ static inline int sched_find_first_bit(unsigned long *b)
  * ffz = Find First Zero in word. Undefined if no zero exists,
  * so code should check against ~0UL first..
  */
-extern __inline__ unsigned long ffz(unsigned long word)
+static __inline__ unsigned long ffz(unsigned long word)
 {
        unsigned long result = 0;
 
@@ -142,7 +117,7 @@ extern __inline__ unsigned long ffz(unsigned long word)
 }
 
 
-extern __inline__ void set_bit(int nr, volatile void * addr)
+static __inline__ void set_bit(int nr, volatile unsigned long * addr)
 {
        int     * a = (int *) addr;
        int     mask;
@@ -155,7 +130,7 @@ extern __inline__ void set_bit(int nr, volatile void * addr)
        local_irq_restore(flags);
 }
 
-extern __inline__ void __set_bit(int nr, volatile void * addr)
+static __inline__ void __set_bit(int nr, volatile unsigned long * addr)
 {
        int     * a = (int *) addr;
        int     mask;
@@ -171,7 +146,7 @@ extern __inline__ void __set_bit(int nr, volatile void * addr)
 #define smp_mb__before_clear_bit()     barrier()
 #define smp_mb__after_clear_bit()      barrier()
 
-extern __inline__ void clear_bit(int nr, volatile void * addr)
+static __inline__ void clear_bit(int nr, volatile unsigned long * addr)
 {
        int     * a = (int *) addr;
        int     mask;
@@ -184,7 +159,7 @@ extern __inline__ void clear_bit(int nr, volatile void * addr)
        local_irq_restore(flags);
 }
 
-extern __inline__ void __clear_bit(int nr, volatile void * addr)
+static __inline__ void __clear_bit(int nr, volatile unsigned long * addr)
 {
        int     * a = (int *) addr;
        int     mask;
@@ -194,7 +169,7 @@ extern __inline__ void __clear_bit(int nr, volatile void * addr)
        *a &= ~mask;
 }
 
-extern __inline__ void change_bit(int nr, volatile void * addr)
+static __inline__ void change_bit(int nr, volatile unsigned long * addr)
 {
        int mask, flags;
        unsigned long *ADDR = (unsigned long *) addr;
@@ -206,7 +181,7 @@ extern __inline__ void change_bit(int nr, volatile void * addr)
        local_irq_restore(flags);
 }
 
-extern __inline__ void __change_bit(int nr, volatile void * addr)
+static __inline__ void __change_bit(int nr, volatile unsigned long * addr)
 {
        int mask;
        unsigned long *ADDR = (unsigned long *) addr;
@@ -216,7 +191,7 @@ extern __inline__ void __change_bit(int nr, volatile void * addr)
        *ADDR ^= mask;
 }
 
-extern __inline__ int test_and_set_bit(int nr, volatile void * addr)
+static __inline__ int test_and_set_bit(int nr, volatile unsigned long * addr)
 {
        int     mask, retval;
        volatile unsigned int *a = (volatile unsigned int *) addr;
@@ -232,7 +207,7 @@ extern __inline__ int test_and_set_bit(int nr, volatile void * addr)
        return retval;
 }
 
-extern __inline__ int __test_and_set_bit(int nr, volatile void * addr)
+static __inline__ int __test_and_set_bit(int nr, volatile unsigned long * addr)
 {
        int     mask, retval;
        volatile unsigned int *a = (volatile unsigned int *) addr;
@@ -244,7 +219,7 @@ extern __inline__ int __test_and_set_bit(int nr, volatile void * addr)
        return retval;
 }
 
-extern __inline__ int test_and_clear_bit(int nr, volatile void * addr)
+static __inline__ int test_and_clear_bit(int nr, volatile unsigned long * addr)
 {
        int     mask, retval;
        volatile unsigned int *a = (volatile unsigned int *) addr;
@@ -260,7 +235,7 @@ extern __inline__ int test_and_clear_bit(int nr, volatile void * addr)
        return retval;
 }
 
-extern __inline__ int __test_and_clear_bit(int nr, volatile void * addr)
+static __inline__ int __test_and_clear_bit(int nr, volatile unsigned long * addr)
 {
        int     mask, retval;
        volatile unsigned int *a = (volatile unsigned int *) addr;
@@ -272,7 +247,7 @@ extern __inline__ int __test_and_clear_bit(int nr, volatile void * addr)
        return retval;
 }
 
-extern __inline__ int test_and_change_bit(int nr, volatile void * addr)
+static __inline__ int test_and_change_bit(int nr, volatile unsigned long * addr)
 {
        int     mask, retval;
        volatile unsigned int *a = (volatile unsigned int *) addr;
@@ -288,7 +263,7 @@ extern __inline__ int test_and_change_bit(int nr, volatile void * addr)
        return retval;
 }
 
-extern __inline__ int __test_and_change_bit(int nr, volatile void * addr)
+static __inline__ int __test_and_change_bit(int nr, volatile unsigned long * addr)
 {
        int     mask, retval;
        volatile unsigned int *a = (volatile unsigned int *) addr;
@@ -303,12 +278,12 @@ extern __inline__ int __test_and_change_bit(int nr, volatile void * addr)
 /*
  * This routine doesn't need to be atomic.
  */
-extern __inline__ int __constant_test_bit(int nr, const volatile void * addr)
+static __inline__ int __constant_test_bit(int nr, const volatile unsigned long * addr)
 {
        return ((1UL << (nr & 31)) & (((const volatile unsigned int *) addr)[nr >> 5])) != 0;
 }
 
-extern __inline__ int __test_bit(int nr, volatile void * addr)
+static __inline__ int __test_bit(int nr, const unsigned long * addr)
 {
        int     * a = (int *) addr;
        int     mask;
@@ -326,7 +301,7 @@ extern __inline__ int __test_bit(int nr, volatile void * addr)
 #define find_first_zero_bit(addr, size) \
         find_next_zero_bit((addr), (size), 0)
 
-extern __inline__ int find_next_zero_bit (void * addr, int size, int offset)
+static __inline__ int find_next_zero_bit (void * addr, int size, int offset)
 {
        unsigned long *p = ((unsigned long *) addr) + (offset >> 5);
        unsigned long result = offset & ~31UL;
@@ -372,7 +347,7 @@ found_middle:
 #define hweight8(x) generic_hweight8(x)
 
 
-extern __inline__ int ext2_set_bit(int nr, volatile void * addr)
+static __inline__ int ext2_set_bit(int nr, volatile void * addr)
 {
        int             mask, retval;
        unsigned long   flags;
@@ -387,7 +362,7 @@ extern __inline__ int ext2_set_bit(int nr, volatile void * addr)
        return retval;
 }
 
-extern __inline__ int ext2_clear_bit(int nr, volatile void * addr)
+static __inline__ int ext2_clear_bit(int nr, volatile void * addr)
 {
        int             mask, retval;
        unsigned long   flags;
@@ -420,7 +395,7 @@ extern __inline__ int ext2_clear_bit(int nr, volatile void * addr)
                ret;                                    \
        })
 
-extern __inline__ int ext2_test_bit(int nr, const volatile void * addr)
+static __inline__ int ext2_test_bit(int nr, const volatile void * addr)
 {
        int     mask;
        const volatile unsigned char    *ADDR = (const unsigned char *) addr;
@@ -433,7 +408,7 @@ extern __inline__ int ext2_test_bit(int nr, const volatile void * addr)
 #define ext2_find_first_zero_bit(addr, size) \
         ext2_find_next_zero_bit((addr), (size), 0)
 
-extern __inline__ unsigned long ext2_find_next_zero_bit(void *addr, unsigned long size, unsigned long offset)
+static __inline__ unsigned long ext2_find_next_zero_bit(void *addr, unsigned long size, unsigned long offset)
 {
        unsigned long *p = ((unsigned long *) addr) + (offset >> 5);
        unsigned long result = offset & ~31UL;