[U-Boot] [PATCH] mmc: mmc_legacy: fix the compiler error with disabled CONFIG_DM_MMC_OPS

Jaehoon Chung jh80.chung at samsung.com
Thu Aug 11 04:12:09 CEST 2016


To prevent the compiler error, split the checking condition whether
cfg->ops is NULL or not.
It's more clearly, because it's not included in mmc_config structure
when CONFIG_DM_MMC_OPS is disabled.

drivers/mmc/mmc_legacy.c: In function ‘mmc_create’:
drivers/mmc/mmc_legacy.c:118:31: error: ‘const struct mmc_config’ has no member named ‘ops’
drivers/mmc/mmc_legacy.c:118:58: error: ‘const struct mmc_config’ has no member named ‘ops’
make[1]: *** [drivers/mmc/mmc_legacy.o] Error 1

Signed-off-by: Jaehoon Chung <jh80.chung at samsung.com>
---
 drivers/mmc/mmc_legacy.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/mmc/mmc_legacy.c b/drivers/mmc/mmc_legacy.c
index 040728b..4baf5f0 100644
--- a/drivers/mmc/mmc_legacy.c
+++ b/drivers/mmc/mmc_legacy.c
@@ -115,10 +115,15 @@ struct mmc *mmc_create(const struct mmc_config *cfg, void *priv)
 	struct mmc *mmc;
 
 	/* quick validation */
-	if (cfg == NULL || cfg->ops == NULL || cfg->ops->send_cmd == NULL ||
+	if (cfg == NULL || cfg->ops->send_cmd == NULL ||
 	    cfg->f_min == 0 || cfg->f_max == 0 || cfg->b_max == 0)
 		return NULL;
 
+#ifndef CONFIG_DM_MMC_OPS
+	if (cfg->ops == NULL)
+		return NULL;
+#endif
+
 	mmc = calloc(1, sizeof(*mmc));
 	if (mmc == NULL)
 		return NULL;
-- 
1.9.1



More information about the U-Boot mailing list