Skip to content
Snippets Groups Projects
Commit 7cb73730 authored by Nathan Rossi's avatar Nathan Rossi Committed by Michal Simek
Browse files

microblaze: Fix style issues in header files 


Fix various style issues in MicroBlaze header files. Specifically fixing
style voilations including '__inline__', 'foo * bar' and 'void foo ('.

Signed-off-by: default avatarNathan Rossi <nathan@nathanrossi.com>
Cc: Michal Simek <monstr@monstr.eu>
Cc: Tom Rini <trini@konsulko.com>
Signed-off-by: default avatarMichal Simek <michal.simek@xilinx.com>
parent 736d1746
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
arch/microblaze/include/asm/bitops.h
+ 33
− 33
View file @ 7cb73730
...@@ -21,31 +21,31 @@ ...@@ -21,31 +21,31 @@
* The __ functions are not atomic * 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 __clear_bit(nr, addr) clear_bit(nr, addr)
#define PLATFORM__CLEAR_BIT #define PLATFORM__CLEAR_BIT
extern void change_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 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_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_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 __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 __constant_test_bit(int nr, const volatile void *addr);
extern int __test_bit(int nr, 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_first_zero_bit(void *addr, unsigned size);
extern int find_next_zero_bit (void * addr, int size, int offset); extern int find_next_zero_bit(void *addr, int size, int offset);
/* /*
* ffz = Find First Zero in word. Undefined if no zero exists, * ffz = Find First Zero in word. Undefined if no zero exists,
* so code should check against ~0UL first.. * 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; unsigned long result = 0;
...@@ -57,7 +57,7 @@ extern __inline__ unsigned long ffz(unsigned long word) ...@@ -57,7 +57,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 * a = (int *) addr;
int mask; int mask;
...@@ -70,7 +70,7 @@ extern __inline__ void set_bit(int nr, volatile void * addr) ...@@ -70,7 +70,7 @@ extern __inline__ void set_bit(int nr, volatile void * addr)
restore_flags(flags); 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 * a = (int *) addr;
int mask; int mask;
...@@ -87,7 +87,7 @@ extern __inline__ void __set_bit(int nr, volatile void * addr) ...@@ -87,7 +87,7 @@ extern __inline__ void __set_bit(int nr, volatile void * addr)
#define smp_mb__before_clear_bit() barrier() #define smp_mb__before_clear_bit() barrier()
#define smp_mb__after_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 * a = (int *) addr;
int mask; int mask;
...@@ -100,7 +100,7 @@ extern __inline__ void clear_bit(int nr, volatile void * addr) ...@@ -100,7 +100,7 @@ extern __inline__ void clear_bit(int nr, volatile void * addr)
restore_flags(flags); 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; int mask;
unsigned long flags; unsigned long flags;
...@@ -113,7 +113,7 @@ extern __inline__ void change_bit(int nr, volatile void * addr) ...@@ -113,7 +113,7 @@ extern __inline__ void change_bit(int nr, volatile void * addr)
restore_flags(flags); 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; int mask;
unsigned long *ADDR = (unsigned long *) addr; unsigned long *ADDR = (unsigned long *) addr;
...@@ -123,7 +123,7 @@ extern __inline__ void __change_bit(int nr, volatile void * addr) ...@@ -123,7 +123,7 @@ extern __inline__ void __change_bit(int nr, volatile void * addr)
*ADDR ^= mask; *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; int mask, retval;
volatile unsigned int *a = (volatile unsigned int *) addr; volatile unsigned int *a = (volatile unsigned int *) addr;
...@@ -139,7 +139,7 @@ extern __inline__ int test_and_set_bit(int nr, volatile void * addr) ...@@ -139,7 +139,7 @@ extern __inline__ int test_and_set_bit(int nr, volatile void * addr)
return retval; 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; int mask, retval;
volatile unsigned int *a = (volatile unsigned int *) addr; volatile unsigned int *a = (volatile unsigned int *) addr;
...@@ -151,7 +151,7 @@ extern __inline__ int __test_and_set_bit(int nr, volatile void * addr) ...@@ -151,7 +151,7 @@ extern __inline__ int __test_and_set_bit(int nr, volatile void * addr)
return retval; 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; int mask, retval;
volatile unsigned int *a = (volatile unsigned int *) addr; volatile unsigned int *a = (volatile unsigned int *) addr;
...@@ -167,7 +167,7 @@ extern __inline__ int test_and_clear_bit(int nr, volatile void * addr) ...@@ -167,7 +167,7 @@ extern __inline__ int test_and_clear_bit(int nr, volatile void * addr)
return retval; 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; int mask, retval;
volatile unsigned int *a = (volatile unsigned int *) addr; volatile unsigned int *a = (volatile unsigned int *) addr;
...@@ -179,7 +179,7 @@ extern __inline__ int __test_and_clear_bit(int nr, volatile void * addr) ...@@ -179,7 +179,7 @@ extern __inline__ int __test_and_clear_bit(int nr, volatile void * addr)
return retval; 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; int mask, retval;
volatile unsigned int *a = (volatile unsigned int *) addr; volatile unsigned int *a = (volatile unsigned int *) addr;
...@@ -195,7 +195,7 @@ extern __inline__ int test_and_change_bit(int nr, volatile void * addr) ...@@ -195,7 +195,7 @@ extern __inline__ int test_and_change_bit(int nr, volatile void * addr)
return retval; 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; int mask, retval;
volatile unsigned int *a = (volatile unsigned int *) addr; volatile unsigned int *a = (volatile unsigned int *) addr;
...@@ -210,12 +210,12 @@ extern __inline__ int __test_and_change_bit(int nr, volatile void * addr) ...@@ -210,12 +210,12 @@ extern __inline__ int __test_and_change_bit(int nr, volatile void * addr)
/* /*
* This routine doesn't need to be atomic. * 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; 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 * a = (int *) addr;
int mask; int mask;
...@@ -233,7 +233,7 @@ extern __inline__ int __test_bit(int nr, volatile void * addr) ...@@ -233,7 +233,7 @@ extern __inline__ int __test_bit(int nr, volatile void * addr)
#define find_first_zero_bit(addr, size) \ #define find_first_zero_bit(addr, size) \
find_next_zero_bit((addr), (size), 0) 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 *p = ((unsigned long *) addr) + (offset >> 5);
unsigned long result = offset & ~31UL; unsigned long result = offset & ~31UL;
...@@ -279,7 +279,7 @@ found_middle: ...@@ -279,7 +279,7 @@ found_middle:
#define hweight8(x) generic_hweight8(x) #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; int mask, retval;
unsigned long flags; unsigned long flags;
...@@ -294,7 +294,7 @@ extern __inline__ int ext2_set_bit(int nr, volatile void * addr) ...@@ -294,7 +294,7 @@ extern __inline__ int ext2_set_bit(int nr, volatile void * addr)
return retval; 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; int mask, retval;
unsigned long flags; unsigned long flags;
...@@ -309,7 +309,7 @@ extern __inline__ int ext2_clear_bit(int nr, volatile void * addr) ...@@ -309,7 +309,7 @@ extern __inline__ int ext2_clear_bit(int nr, volatile void * addr)
return retval; 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; int mask;
const volatile unsigned char *ADDR = (const unsigned char *) addr; const volatile unsigned char *ADDR = (const unsigned char *) addr;
......
arch/microblaze/include/asm/system.h
+ 1
− 1
View file @ 7cb73730
...@@ -131,7 +131,7 @@ extern void *switch_thread (struct thread_struct *last, ...@@ -131,7 +131,7 @@ extern void *switch_thread (struct thread_struct *last,
((__typeof__ (*(ptr)))__xchg ((unsigned long)(with), (ptr), sizeof (*(ptr)))) ((__typeof__ (*(ptr)))__xchg ((unsigned long)(with), (ptr), sizeof (*(ptr))))
#define tas(ptr) (xchg ((ptr), 1)) #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) __volatile__ void *ptr, int size)
{ {
unsigned long tmp, flags; unsigned long tmp, flags;
......
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