From: Jaehoon Chung <jh80.chung@samsung.com>
Date: Fri, 12 Aug 2016 02:39:05 +0000 (+0900)
Subject: mmc: mmc_legacy: fix the compiler error with disabled CONFIG_DM_MMC_OPS
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=177381a9f9e956353deaa56d86bec47e02995ff3;p=project%2Fbcm63xx%2Fu-boot.git

mmc: mmc_legacy: fix the compiler error with disabled CONFIG_DM_MMC_OPS

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@samsung.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
---

diff --git a/drivers/mmc/mmc_legacy.c b/drivers/mmc/mmc_legacy.c
index 040728b45d..25361d10f6 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 ||
-	    cfg->f_min == 0 || cfg->f_max == 0 || cfg->b_max == 0)
+	if (cfg == NULL || cfg->f_min == 0 ||
+	    cfg->f_max == 0 || cfg->b_max == 0)
 		return NULL;
 
+#ifndef CONFIG_DM_MMC_OPS
+	if (cfg->ops == NULL || cfg->ops->send_cmd == NULL)
+		return NULL;
+#endif
+
 	mmc = calloc(1, sizeof(*mmc));
 	if (mmc == NULL)
 		return NULL;