Fix various style issues in MicroBlaze header files. Specifically fixing style voilations including '__inline__', 'foo * bar' and 'void foo ('.
Signed-off-by: Nathan Rossi nathan@nathanrossi.com Cc: Michal Simek monstr@monstr.eu Cc: Tom Rini trini@konsulko.com --- arch/microblaze/include/asm/bitops.h | 66 ++++++++++++++++++------------------ arch/microblaze/include/asm/system.h | 2 +- 2 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/arch/microblaze/include/asm/bitops.h b/arch/microblaze/include/asm/bitops.h index 0ac78d7..d42ee61 100644 --- a/arch/microblaze/include/asm/bitops.h +++ b/arch/microblaze/include/asm/bitops.h @@ -17,31 +17,31 @@ * 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 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); #define __clear_bit(nr, addr) clear_bit(nr, addr) #define PLATFORM__CLEAR_BIT
-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); +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);
/* * 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) +extern inline unsigned long ffz(unsigned long word) { unsigned long result = 0;
@@ -53,7 +53,7 @@ extern __inline__ unsigned long ffz(unsigned long word) }
-extern __inline__ void set_bit(int nr, volatile void * addr) +extern inline void set_bit(int nr, volatile void *addr) { int * a = (int *) addr; int mask; @@ -66,7 +66,7 @@ extern __inline__ void set_bit(int nr, volatile void * addr) restore_flags(flags); }
-extern __inline__ void __set_bit(int nr, volatile void * addr) +extern inline void __set_bit(int nr, volatile void *addr) { int * a = (int *) addr; int mask; @@ -83,7 +83,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) +extern inline void clear_bit(int nr, volatile void *addr) { int * a = (int *) addr; int mask; @@ -96,7 +96,7 @@ extern __inline__ void clear_bit(int nr, volatile void * addr) restore_flags(flags); }
-extern __inline__ void change_bit(int nr, volatile void * addr) +extern inline void change_bit(int nr, volatile void *addr) { int mask; unsigned long flags; @@ -109,7 +109,7 @@ extern __inline__ void change_bit(int nr, volatile void * addr) restore_flags(flags); }
-extern __inline__ void __change_bit(int nr, volatile void * addr) +extern inline void __change_bit(int nr, volatile void *addr) { int mask; unsigned long *ADDR = (unsigned long *) addr; @@ -119,7 +119,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) +extern inline int test_and_set_bit(int nr, volatile void *addr) { int mask, retval; volatile unsigned int *a = (volatile unsigned int *) addr; @@ -135,7 +135,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) +extern inline int __test_and_set_bit(int nr, volatile void *addr) { int mask, retval; volatile unsigned int *a = (volatile unsigned int *) addr; @@ -147,7 +147,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) +extern inline int test_and_clear_bit(int nr, volatile void *addr) { int mask, retval; volatile unsigned int *a = (volatile unsigned int *) addr; @@ -163,7 +163,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) +extern inline int __test_and_clear_bit(int nr, volatile void *addr) { int mask, retval; volatile unsigned int *a = (volatile unsigned int *) addr; @@ -175,7 +175,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) +extern inline int test_and_change_bit(int nr, volatile void *addr) { int mask, retval; volatile unsigned int *a = (volatile unsigned int *) addr; @@ -191,7 +191,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) +extern inline int __test_and_change_bit(int nr, volatile void *addr) { int mask, retval; volatile unsigned int *a = (volatile unsigned int *) addr; @@ -206,12 +206,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) +extern inline int __constant_test_bit(int nr, const volatile void *addr) { return ((1UL << (nr & 31)) & (((const volatile unsigned int *) addr)[nr >> 5])) != 0; }
-extern __inline__ int __test_bit(int nr, volatile void * addr) +extern inline int __test_bit(int nr, volatile void *addr) { int * a = (int *) addr; int mask; @@ -229,7 +229,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) +extern 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; @@ -275,7 +275,7 @@ found_middle: #define hweight8(x) generic_hweight8(x)
-extern __inline__ int ext2_set_bit(int nr, volatile void * addr) +extern inline int ext2_set_bit(int nr, volatile void *addr) { int mask, retval; unsigned long flags; @@ -290,7 +290,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) +extern inline int ext2_clear_bit(int nr, volatile void *addr) { int mask, retval; unsigned long flags; @@ -305,7 +305,7 @@ extern __inline__ int ext2_clear_bit(int nr, volatile void * addr) return retval; }
-extern __inline__ int ext2_test_bit(int nr, const volatile void * addr) +extern inline int ext2_test_bit(int nr, const volatile void *addr) { int mask; const volatile unsigned char *ADDR = (const unsigned char *) addr; diff --git a/arch/microblaze/include/asm/system.h b/arch/microblaze/include/asm/system.h index 0297a11..3090835 100644 --- a/arch/microblaze/include/asm/system.h +++ b/arch/microblaze/include/asm/system.h @@ -131,7 +131,7 @@ extern void *switch_thread (struct thread_struct *last, ((__typeof__ (*(ptr)))__xchg ((unsigned long)(with), (ptr), sizeof (*(ptr)))) #define tas(ptr) (xchg ((ptr), 1))
-extern inline unsigned long __xchg (unsigned long with, +extern inline unsigned long __xchg(unsigned long with, __volatile__ void *ptr, int size) { unsigned long tmp, flags;