| Message ID | 1470881529-26691-1-git-send-email-jh80.chung@samsung.com |
|---|---|
| State | Superseded |
| Headers | show |
Sorry.. On 08/11/2016 11:12 AM, Jaehoon Chung wrote: > 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. I sent the wrong patch..I will resend the correct patch.. Best Regards, Jaehoon Chung > > 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> > --- > 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; >
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;
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> --- drivers/mmc/mmc_legacy.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)