leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

microblaze: Fix C99/gnu99 compatiblity for inline functions

Browse Source 
'extern inline' is not portable across various C standards. To ensure
compatiblity with various standards/compilers change the functions to
static inline. This is a portable construct and serves as a comparable
definition to 'extern inline' from the gnu90 standard.

Additionally remove the function prototypes as they are not required due
to the functions being declared static and functions are correctly
ordered based on dependence.

Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
Cc: Michal Simek <monstr@monstr.eu>
Cc: Tom Rini <trini@konsulko.com>
Acked-by: Mans Rullgard <mans@mansr.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
This commit is contained in:
Nathan Rossi 2015-11-06 19:25:06 +10:00 committed by Michal Simek
parent 7cb73730c8
commit e0f21e1cbc
2 changed files with 22 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
arch/microblaze/include/asm/bitops.h
View File

@ -13,39 +13,15 @@
#include <asm-generic/bitops/__ffs.h> #include <asm-generic/bitops/__ffs.h>
#ifdef __KERNEL__ #ifdef __KERNEL__
/*
* Function prototypes to keep gcc -Wall happy
*/
/* /*
* 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 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);
/* /*
* 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) static inline unsigned long ffz(unsigned long word)
{ {
unsigned long result = 0; unsigned long result = 0;
@ -57,7 +33,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 void *addr)
{ {
int * a = (int *) addr; int * a = (int *) addr;
int mask; int mask;
@ -70,7 +46,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) static inline void __set_bit(int nr, volatile void *addr)
{ {
int * a = (int *) addr; int * a = (int *) addr;
int mask; int mask;
@ -87,7 +63,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) static inline void clear_bit(int nr, volatile void *addr)
{ {
int * a = (int *) addr; int * a = (int *) addr;
int mask; int mask;
@ -100,7 +76,10 @@ 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) #define __clear_bit(nr, addr) clear_bit(nr, addr)
#define PLATFORM__CLEAR_BIT
static inline void change_bit(int nr, volatile void *addr)
{ {
int mask; int mask;
unsigned long flags; unsigned long flags;
@ -113,7 +92,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) static 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 +102,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) static 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 +118,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) static 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 +130,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) static 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 +146,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) static 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 +158,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) static 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 +174,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) static 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 +189,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) static 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) static inline int __test_bit(int nr, volatile void *addr)
{ {
int * a = (int *) addr; int * a = (int *) addr;
int mask; int mask;
@ -233,7 +212,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) static 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 +258,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) static inline int ext2_set_bit(int nr, volatile void *addr)
{ {
int mask, retval; int mask, retval;
unsigned long flags; unsigned long flags;
@ -294,7 +273,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) static inline int ext2_clear_bit(int nr, volatile void *addr)
{ {
int mask, retval; int mask, retval;
unsigned long flags; unsigned long flags;
@ -309,7 +288,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) static 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;

2
arch/microblaze/include/asm/system.h
View File

@ -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, static 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;