diff options
| author | Jeroen Hofstee <jeroen@myspectrum.nl> | 2014-07-12 21:24:08 +0200 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-07-18 17:53:24 -0400 |
| commit | 750121c3506399e758849a4f37c772c3f317045f (patch) | |
| tree | d8c8231b7af9fdd5a70bb130a12daf38064fc4cf | |
| parent | 0b7df656570e9126616529d03d99261956081bc4 (diff) | |
| download | u-boot-imx-750121c3506399e758849a4f37c772c3f317045f.zip u-boot-imx-750121c3506399e758849a4f37c772c3f317045f.tar.gz u-boot-imx-750121c3506399e758849a4f37c772c3f317045f.tar.bz2 | |
mmc: prevent some warnings with make W=1
Add missing prototypes for global functions and
make local functions static.
cc: panto@antoniou-consulting.com
Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl>
| -rw-r--r-- | drivers/mmc/mmc.c | 6 | ||||
| -rw-r--r-- | drivers/mmc/omap_hsmmc.c | 2 | ||||
| -rw-r--r-- | include/mmc.h | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index e3df1f7..a26f3ce 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -21,7 +21,7 @@ static struct list_head mmc_devices; static int cur_dev_num = -1; -int __weak board_mmc_getwp(struct mmc *mmc) +__weak int board_mmc_getwp(struct mmc *mmc) { return -1; } @@ -375,7 +375,7 @@ static int mmc_send_op_cond_iter(struct mmc *mmc, struct mmc_cmd *cmd, return 0; } -int mmc_send_op_cond(struct mmc *mmc) +static int mmc_send_op_cond(struct mmc *mmc) { struct mmc_cmd cmd; int err, i; @@ -397,7 +397,7 @@ int mmc_send_op_cond(struct mmc *mmc) return IN_PROGRESS; } -int mmc_complete_op_cond(struct mmc *mmc) +static int mmc_complete_op_cond(struct mmc *mmc) { struct mmc_cmd cmd; int timeout = 1000; diff --git a/drivers/mmc/omap_hsmmc.c b/drivers/mmc/omap_hsmmc.c index 17cbb09..5b0c302 100644 --- a/drivers/mmc/omap_hsmmc.c +++ b/drivers/mmc/omap_hsmmc.c @@ -120,7 +120,7 @@ static void omap5_pbias_config(struct mmc *mmc) } #endif -unsigned char mmc_board_init(struct mmc *mmc) +static unsigned char mmc_board_init(struct mmc *mmc) { #if defined(CONFIG_OMAP34XX) t2_t *t2_base = (t2_t *)T2_BASE; diff --git a/include/mmc.h b/include/mmc.h index f46572e..7f5f9bc 100644 --- a/include/mmc.h +++ b/include/mmc.h @@ -327,10 +327,11 @@ struct mmc *find_mmc_device(int dev_num); int mmc_set_dev(int dev_num); void print_mmc_devices(char separator); int get_mmc_num(void); -int board_mmc_getcd(struct mmc *mmc); int mmc_switch_part(int dev_num, unsigned int part_num); int mmc_getcd(struct mmc *mmc); +int board_mmc_getcd(struct mmc *mmc); int mmc_getwp(struct mmc *mmc); +int board_mmc_getwp(struct mmc *mmc); int mmc_set_dsr(struct mmc *mmc, u16 val); /* Function to change the size of boot partition and rpmb partitions */ int mmc_boot_partition_size_change(struct mmc *mmc, unsigned long bootsize, @@ -385,6 +386,7 @@ int mmc_legacy_init(int verbose); #endif int board_mmc_init(bd_t *bis); +int cpu_mmc_init(bd_t *bis); /* Set block count limit because of 16 bit register limit on some hardware*/ #ifndef CONFIG_SYS_MMC_MAX_BLK_COUNT |