lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mmc: sh_mmcif: Convert extern inline to static inline.

Browse Source 
Presently the extern inline case results in a compiler warning on ARM due
to the memory barrier definition used in the I/O routines. These
ultimately all want to be static inline anyways, so just convert them all
in place.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
Paul Mundt
2010-11-04 12:21:25 +09:00
parent cad3cde3f6
commit 2f6ba5792c
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/linux/mmc/sh_mmcif.h
View File

@@ -59,19 +59,19 @@ struct sh_mmcif_plat_data {
#define MMCIF_CE_HOST_STS2 0x0000004C #define MMCIF_CE_HOST_STS2 0x0000004C
#define MMCIF_CE_VERSION 0x0000007C #define MMCIF_CE_VERSION 0x0000007C
extern inline u32 sh_mmcif_readl(void __iomem *addr, int reg) static inline u32 sh_mmcif_readl(void __iomem *addr, int reg)
{ {
return readl(addr + reg); return readl(addr + reg);
} }
extern inline void sh_mmcif_writel(void __iomem *addr, int reg, u32 val) static inline void sh_mmcif_writel(void __iomem *addr, int reg, u32 val)
{ {
writel(val, addr + reg); writel(val, addr + reg);
} }
#define SH_MMCIF_BBS 512 /* boot block size */ #define SH_MMCIF_BBS 512 /* boot block size */
extern inline void sh_mmcif_boot_cmd_send(void __iomem *base, static inline void sh_mmcif_boot_cmd_send(void __iomem *base,
unsigned long cmd, unsigned long arg) unsigned long cmd, unsigned long arg)
{ {
sh_mmcif_writel(base, MMCIF_CE_INT, 0); sh_mmcif_writel(base, MMCIF_CE_INT, 0);
@@ -79,7 +79,7 @@ extern inline void sh_mmcif_boot_cmd_send(void __iomem *base,
sh_mmcif_writel(base, MMCIF_CE_CMD_SET, cmd); sh_mmcif_writel(base, MMCIF_CE_CMD_SET, cmd);
} }
extern inline int sh_mmcif_boot_cmd_poll(void __iomem *base, unsigned long mask) static inline int sh_mmcif_boot_cmd_poll(void __iomem *base, unsigned long mask)
{ {
unsigned long tmp; unsigned long tmp;
int cnt; int cnt;
@@ -95,14 +95,14 @@ extern inline int sh_mmcif_boot_cmd_poll(void __iomem *base, unsigned long mask)
return -1; return -1;
} }
extern inline int sh_mmcif_boot_cmd(void __iomem *base, static inline int sh_mmcif_boot_cmd(void __iomem *base,
unsigned long cmd, unsigned long arg) unsigned long cmd, unsigned long arg)
{ {
sh_mmcif_boot_cmd_send(base, cmd, arg); sh_mmcif_boot_cmd_send(base, cmd, arg);
return sh_mmcif_boot_cmd_poll(base, 0x00010000); return sh_mmcif_boot_cmd_poll(base, 0x00010000);
} }
extern inline int sh_mmcif_boot_do_read_single(void __iomem *base, static inline int sh_mmcif_boot_do_read_single(void __iomem *base,
unsigned int block_nr, unsigned int block_nr,
unsigned long *buf) unsigned long *buf)
{ {
@@ -125,7 +125,7 @@ extern inline int sh_mmcif_boot_do_read_single(void __iomem *base,
return 0; return 0;
} }
extern inline int sh_mmcif_boot_do_read(void __iomem *base, static inline int sh_mmcif_boot_do_read(void __iomem *base,
unsigned long first_block, unsigned long first_block,
unsigned long nr_blocks, unsigned long nr_blocks,
void *buf) void *buf)
@@ -143,7 +143,7 @@ extern inline int sh_mmcif_boot_do_read(void __iomem *base,
return ret; return ret;
} }
extern inline void sh_mmcif_boot_init(void __iomem *base) static inline void sh_mmcif_boot_init(void __iomem *base)
{ {
unsigned long tmp; unsigned long tmp;
@@ -177,7 +177,7 @@ extern inline void sh_mmcif_boot_init(void __iomem *base)
sh_mmcif_boot_cmd(base, 0x03400040, 0x00010000); sh_mmcif_boot_cmd(base, 0x03400040, 0x00010000);
} }
extern inline void sh_mmcif_boot_slurp(void __iomem *base, static inline void sh_mmcif_boot_slurp(void __iomem *base,
unsigned char *buf, unsigned char *buf,
unsigned long no_bytes) unsigned long no_bytes)
{ {