Skip to content

Commit

Permalink
[POWERPC] include/asm-powerpc/: "extern inline" -> "static inline"
Browse files Browse the repository at this point in the history
"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>
  • Loading branch information
Adrian Bunk authored and Paul Mackerras committed Dec 4, 2006
1 parent 28f9ec3 commit 4cfbdff
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions include/asm-powerpc/io.h
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ static inline void __raw_writeq(unsigned long v, volatile void __iomem *addr)
#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__( \
Expand All @@ -329,7 +329,7 @@ extern __inline__ unsigned int name(unsigned int port) \
}

#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" \
Expand Down
4 changes: 2 additions & 2 deletions include/asm-powerpc/tsi108.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
4 changes: 2 additions & 2 deletions include/asm-powerpc/uaccess.h
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ extern unsigned long __copy_tofrom_user(void __user *to,

#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;
Expand All @@ -319,7 +319,7 @@ extern inline unsigned long copy_from_user(void *to,
return 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;
Expand Down

0 comments on commit 4cfbdff

Please sign in to comment.