include/asm-powerpc/: "extern inline" -> "static inline"
PATCH 1/1 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 <[email protected]>
---
include/asm-powerpc/io.h | 4 ++-- include/asm-powerpc/tsi108.h | 4 ++-- include/asm-powerpc/uaccess.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-)
include/asm-powerpc/io.h renamed from include/asm-powerpc/io.h.old +2 -2
@@ -304,7 +304,7 @@ do { \#ifdef CONFIG_PPC32 #define __do_in_asm (name, op) \ -extern __inline__ unsigned int name(unsigned int port) \ +static inline unsigned int name(unsigned int port) \ { \ unsigned int x; \ __asm__ __volatile__( \
@@ -331,7 +331,7 @@ extern __inline__ unsigned int name(unsi }#define __do_out_asm (name, op) \ -extern __inline__ void name(unsigned int val, unsigned int port) \ +static inline void name(unsigned int val, unsigned int port) \ { \ __asm__ __volatile__( \ "sync\n" \
include/asm-powerpc/tsi108.h renamed from include/asm-powerpc/tsi108.h.old +2 -2
@@ -98,12 +98,12 @@ typedef struct {extern u32 get_vir_csrbase (void );extern u32 tsi108_csr_vir_base; -extern inline u32 tsi108_read_reg (u32 reg_offset) +static inline u32 tsi108_read_reg (u32 reg_offset) {return in_be32 ((volatile u32 *)(tsi108_csr_vir_base + reg_offset)); } -extern inline void tsi108_write_reg (u32 reg_offset,u32 val) +static inline void tsi108_write_reg (u32 reg_offset,u32 val) {out_be32 ((volatile u32 *)(tsi108_csr_vir_base + reg_offset), val); }
include/asm-powerpc/uaccess.h renamed from include/asm-powerpc/uaccess.h.old +2 -2
@@ -304,7 +304,7 @@ extern unsigned long __copy_tofrom_user(#ifndef __powerpc64__ -extern inline unsigned long copy_from_user (void *to, +static inline unsigned long copy_from_user (void *to,const void __user *from,unsigned long n) {unsigned long over;
@@ -319,7 +319,7 @@ extern inline unsigned long copy_from_usreturn n; } -extern inline unsigned long copy_to_user (void __user *to, +static inline unsigned long copy_to_user (void __user *to,const void *from,unsigned long n) {unsigned long over;