diff options
author | Adrian Bunk <bunk@kernel.org> | 2007-08-27 17:28:17 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-10-12 18:43:17 -0400 |
commit | 38598105217f65d21b5f5253c5755af9463c9e9a (patch) | |
tree | 1d37592d254a78f1536f55cbaaf85f495f15035a | |
parent | 5e802dfab7bbbee1e63607a3e6d1ceb78ec4ceeb (diff) |
[ARM] "extern inline" -> "static inline"
"extern inline" will have different semantics with gcc 4.3.
Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r-- | arch/arm/nwfpe/ARM-gcc.h | 2 | ||||
-rw-r--r-- | arch/arm/nwfpe/fpa11.inl | 8 | ||||
-rw-r--r-- | include/asm-arm/arch-ixp23xx/platform.h | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/nwfpe/ARM-gcc.h b/arch/arm/nwfpe/ARM-gcc.h index e6598470b076..436e54aa02ec 100644 --- a/arch/arm/nwfpe/ARM-gcc.h +++ b/arch/arm/nwfpe/ARM-gcc.h | |||
@@ -68,7 +68,7 @@ a compiler does not support explicit inlining, this macro should be defined | |||
68 | to be `static'. | 68 | to be `static'. |
69 | ------------------------------------------------------------------------------- | 69 | ------------------------------------------------------------------------------- |
70 | */ | 70 | */ |
71 | #define INLINE extern __inline__ | 71 | #define INLINE static inline |
72 | 72 | ||
73 | 73 | ||
74 | /* For use as a GCC soft-float library we need some special function names. */ | 74 | /* For use as a GCC soft-float library we need some special function names. */ |
diff --git a/arch/arm/nwfpe/fpa11.inl b/arch/arm/nwfpe/fpa11.inl index 10c3caf2868f..ab8d6826245f 100644 --- a/arch/arm/nwfpe/fpa11.inl +++ b/arch/arm/nwfpe/fpa11.inl | |||
@@ -22,13 +22,13 @@ | |||
22 | #include "fpa11.h" | 22 | #include "fpa11.h" |
23 | 23 | ||
24 | /* Read and write floating point status register */ | 24 | /* Read and write floating point status register */ |
25 | extern __inline__ unsigned int readFPSR(void) | 25 | static inline unsigned int readFPSR(void) |
26 | { | 26 | { |
27 | FPA11 *fpa11 = GET_FPA11(); | 27 | FPA11 *fpa11 = GET_FPA11(); |
28 | return (fpa11->fpsr); | 28 | return (fpa11->fpsr); |
29 | } | 29 | } |
30 | 30 | ||
31 | extern __inline__ void writeFPSR(FPSR reg) | 31 | static inline void writeFPSR(FPSR reg) |
32 | { | 32 | { |
33 | FPA11 *fpa11 = GET_FPA11(); | 33 | FPA11 *fpa11 = GET_FPA11(); |
34 | /* the sysid byte in the status register is readonly */ | 34 | /* the sysid byte in the status register is readonly */ |
@@ -36,14 +36,14 @@ extern __inline__ void writeFPSR(FPSR reg) | |||
36 | } | 36 | } |
37 | 37 | ||
38 | /* Read and write floating point control register */ | 38 | /* Read and write floating point control register */ |
39 | extern __inline__ FPCR readFPCR(void) | 39 | static inline FPCR readFPCR(void) |
40 | { | 40 | { |
41 | FPA11 *fpa11 = GET_FPA11(); | 41 | FPA11 *fpa11 = GET_FPA11(); |
42 | /* clear SB, AB and DA bits before returning FPCR */ | 42 | /* clear SB, AB and DA bits before returning FPCR */ |
43 | return (fpa11->fpcr & ~MASK_RFC); | 43 | return (fpa11->fpcr & ~MASK_RFC); |
44 | } | 44 | } |
45 | 45 | ||
46 | extern __inline__ void writeFPCR(FPCR reg) | 46 | static inline void writeFPCR(FPCR reg) |
47 | { | 47 | { |
48 | FPA11 *fpa11 = GET_FPA11(); | 48 | FPA11 *fpa11 = GET_FPA11(); |
49 | fpa11->fpcr &= ~MASK_WFC; /* clear SB, AB and DA bits */ | 49 | fpa11->fpcr &= ~MASK_WFC; /* clear SB, AB and DA bits */ |
diff --git a/include/asm-arm/arch-ixp23xx/platform.h b/include/asm-arm/arch-ixp23xx/platform.h index 56e16d66645a..db8aa304c93d 100644 --- a/include/asm-arm/arch-ixp23xx/platform.h +++ b/include/asm-arm/arch-ixp23xx/platform.h | |||
@@ -14,17 +14,17 @@ | |||
14 | 14 | ||
15 | #ifndef __ASSEMBLY__ | 15 | #ifndef __ASSEMBLY__ |
16 | 16 | ||
17 | extern inline unsigned long ixp2000_reg_read(volatile void *reg) | 17 | static inline unsigned long ixp2000_reg_read(volatile void *reg) |
18 | { | 18 | { |
19 | return *((volatile unsigned long *)reg); | 19 | return *((volatile unsigned long *)reg); |
20 | } | 20 | } |
21 | 21 | ||
22 | extern inline void ixp2000_reg_write(volatile void *reg, unsigned long val) | 22 | static inline void ixp2000_reg_write(volatile void *reg, unsigned long val) |
23 | { | 23 | { |
24 | *((volatile unsigned long *)reg) = val; | 24 | *((volatile unsigned long *)reg) = val; |
25 | } | 25 | } |
26 | 26 | ||
27 | extern inline void ixp2000_reg_wrb(volatile void *reg, unsigned long val) | 27 | static inline void ixp2000_reg_wrb(volatile void *reg, unsigned long val) |
28 | { | 28 | { |
29 | *((volatile unsigned long *)reg) = val; | 29 | *((volatile unsigned long *)reg) = val; |
30 | } | 30 | } |