mmc: remove duplicate mmc_get_env_dev() implementations

Since it's so trivial I could just about tolerate this when there were only
two copies of it. But now there are about to be three.

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
This commit is contained in:
David Woodhouse 2020-08-04 10:05:46 +01:00 committed by Tom Rini
parent 684710dc33
commit 4dee3f7851
3 changed files with 9 additions and 14 deletions

View File

@ -3111,3 +3111,12 @@ int mmc_set_bkops_enable(struct mmc *mmc)
return 0;
}
#endif
__weak int mmc_get_env_dev(void)
{
#ifdef CONFIG_SYS_MMC_ENV_DEV
return CONFIG_SYS_MMC_ENV_DEV;
#else
return 0;
#endif
}

9
env/fat.c vendored
View File

@ -29,15 +29,6 @@
# define LOADENV
#endif
__weak int mmc_get_env_dev(void)
{
#ifdef CONFIG_SYS_MMC_ENV_DEV
return CONFIG_SYS_MMC_ENV_DEV;
#else
return 0;
#endif
}
static char *env_fat_device_and_part(void)
{
#ifdef CONFIG_MMC

5
env/mmc.c vendored
View File

@ -24,11 +24,6 @@
DECLARE_GLOBAL_DATA_PTR;
__weak int mmc_get_env_dev(void)
{
return CONFIG_SYS_MMC_ENV_DEV;
}
#if CONFIG_IS_ENABLED(OF_CONTROL)
static inline int mmc_offset_try_partition(const char *str, int copy, s64 *val)
{