diff options
author | Adrian Bunk <bunk@stusta.de> | 2006-12-01 06:53:18 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-12-04 04:41:26 -0500 |
commit | 4cfbdfff70989a0d99b6f357fbbe379c22a05f7c (patch) | |
tree | d1a547c3c82462cbc75d6eac827261607b33ae69 /include/asm-powerpc | |
parent | 28f9ec349ae47c91768b7bc5607db4442c818e11 (diff) |
[POWERPC] include/asm-powerpc/: "extern inline" -> "static inline"
"extern inline" generates a warning with -Wmissing-prototypes and I'm
currently working on getting the kernel cleaned up for adding this to
the CFLAGS since it will help us to avoid a nasty class of runtime
errors.
If there are places that really need a forced inline, __always_inline
would be the correct solution.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include/asm-powerpc')
-rw-r--r-- | include/asm-powerpc/io.h | 4 | ||||
-rw-r--r-- | include/asm-powerpc/tsi108.h | 4 | ||||
-rw-r--r-- | include/asm-powerpc/uaccess.h | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/include/asm-powerpc/io.h b/include/asm-powerpc/io.h index 75df3bce9ccb..1cd532379c30 100644 --- a/include/asm-powerpc/io.h +++ b/include/asm-powerpc/io.h | |||
@@ -302,7 +302,7 @@ static inline void __raw_writeq(unsigned long v, volatile void __iomem *addr) | |||
302 | #ifdef CONFIG_PPC32 | 302 | #ifdef CONFIG_PPC32 |
303 | 303 | ||
304 | #define __do_in_asm(name, op) \ | 304 | #define __do_in_asm(name, op) \ |
305 | extern __inline__ unsigned int name(unsigned int port) \ | 305 | static inline unsigned int name(unsigned int port) \ |
306 | { \ | 306 | { \ |
307 | unsigned int x; \ | 307 | unsigned int x; \ |
308 | __asm__ __volatile__( \ | 308 | __asm__ __volatile__( \ |
@@ -329,7 +329,7 @@ extern __inline__ unsigned int name(unsigned int port) \ | |||
329 | } | 329 | } |
330 | 330 | ||
331 | #define __do_out_asm(name, op) \ | 331 | #define __do_out_asm(name, op) \ |
332 | extern __inline__ void name(unsigned int val, unsigned int port) \ | 332 | static inline void name(unsigned int val, unsigned int port) \ |
333 | { \ | 333 | { \ |
334 | __asm__ __volatile__( \ | 334 | __asm__ __volatile__( \ |
335 | "sync\n" \ | 335 | "sync\n" \ |
diff --git a/include/asm-powerpc/tsi108.h b/include/asm-powerpc/tsi108.h index 2c702d35a7cf..4e95d153be84 100644 --- a/include/asm-powerpc/tsi108.h +++ b/include/asm-powerpc/tsi108.h | |||
@@ -98,12 +98,12 @@ typedef struct { | |||
98 | extern u32 get_vir_csrbase(void); | 98 | extern u32 get_vir_csrbase(void); |
99 | extern u32 tsi108_csr_vir_base; | 99 | extern u32 tsi108_csr_vir_base; |
100 | 100 | ||
101 | extern inline u32 tsi108_read_reg(u32 reg_offset) | 101 | static inline u32 tsi108_read_reg(u32 reg_offset) |
102 | { | 102 | { |
103 | return in_be32((volatile u32 *)(tsi108_csr_vir_base + reg_offset)); | 103 | return in_be32((volatile u32 *)(tsi108_csr_vir_base + reg_offset)); |
104 | } | 104 | } |
105 | 105 | ||
106 | extern inline void tsi108_write_reg(u32 reg_offset, u32 val) | 106 | static inline void tsi108_write_reg(u32 reg_offset, u32 val) |
107 | { | 107 | { |
108 | out_be32((volatile u32 *)(tsi108_csr_vir_base + reg_offset), val); | 108 | out_be32((volatile u32 *)(tsi108_csr_vir_base + reg_offset), val); |
109 | } | 109 | } |
diff --git a/include/asm-powerpc/uaccess.h b/include/asm-powerpc/uaccess.h index d83fc29c2bbf..adbf16b8cfbb 100644 --- a/include/asm-powerpc/uaccess.h +++ b/include/asm-powerpc/uaccess.h | |||
@@ -304,7 +304,7 @@ extern unsigned long __copy_tofrom_user(void __user *to, | |||
304 | 304 | ||
305 | #ifndef __powerpc64__ | 305 | #ifndef __powerpc64__ |
306 | 306 | ||
307 | extern inline unsigned long copy_from_user(void *to, | 307 | static inline unsigned long copy_from_user(void *to, |
308 | const void __user *from, unsigned long n) | 308 | const void __user *from, unsigned long n) |
309 | { | 309 | { |
310 | unsigned long over; | 310 | unsigned long over; |
@@ -319,7 +319,7 @@ extern inline unsigned long copy_from_user(void *to, | |||
319 | return n; | 319 | return n; |
320 | } | 320 | } |
321 | 321 | ||
322 | extern inline unsigned long copy_to_user(void __user *to, | 322 | static inline unsigned long copy_to_user(void __user *to, |
323 | const void *from, unsigned long n) | 323 | const void *from, unsigned long n) |
324 | { | 324 | { |
325 | unsigned long over; | 325 | unsigned long over; |