From 88227a1d8a734cfd09ac43609abec8b66c2d2610 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Thu, 27 Dec 2012 08:51:08 +0000 Subject: mmc: fsl_esdhc: Use calloc() A malloc() followed by memset() can be simply replaced by calloc(). Signed-off-by: Fabio Estevam Signed-off-by: Andy Fleming --- drivers/mmc/fsl_esdhc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'drivers/mmc/fsl_esdhc.c') diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c index e945c0a47..ec01795f3 100644 --- a/drivers/mmc/fsl_esdhc.c +++ b/drivers/mmc/fsl_esdhc.c @@ -601,8 +601,7 @@ int fsl_esdhc_mmc_init(bd_t *bis) { struct fsl_esdhc_cfg *cfg; - cfg = malloc(sizeof(struct fsl_esdhc_cfg)); - memset(cfg, 0, sizeof(struct fsl_esdhc_cfg)); + cfg = calloc(sizeof(struct fsl_esdhc_cfg), 1); cfg->esdhc_base = CONFIG_SYS_FSL_ESDHC_ADDR; cfg->sdhc_clk = gd->arch.sdhc_clk; return fsl_esdhc_initialize(bis, cfg); -- cgit v1.2.3-70-g09d2 From 48e0b2bd2b6ecc80cd25181ca2fb9c0eaffef320 Mon Sep 17 00:00:00 2001 From: "Haijun.Zhang" Date: Tue, 7 May 2013 15:50:58 +0000 Subject: powerpc/esdhc: Correct judgement for DATA PIO mode The logic for the whether to configure for polling or DMA was mistakenly reversed in this patch: Commit 7b43db92110ec2f15c5f7187a165f2928464966b drivers/mmc/fsl_esdhc.c: fix compiler warnings Signed-off-by: Haijun Zhang CC: Sun Yusong-R58495 Signed-off-by: Andy Fleming --- drivers/mmc/fsl_esdhc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/mmc/fsl_esdhc.c') diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c index ec01795f3..861f4b9d6 100644 --- a/drivers/mmc/fsl_esdhc.c +++ b/drivers/mmc/fsl_esdhc.c @@ -178,7 +178,7 @@ static int esdhc_setup_data(struct mmc *mmc, struct mmc_data *data) int timeout; struct fsl_esdhc_cfg *cfg = (struct fsl_esdhc_cfg *)mmc->priv; struct fsl_esdhc *regs = (struct fsl_esdhc *)cfg->esdhc_base; -#ifndef CONFIG_SYS_FSL_ESDHC_USE_PIO +#ifdef CONFIG_SYS_FSL_ESDHC_USE_PIO uint wml_value; wml_value = data->blocksize/4; -- cgit v1.2.3-70-g09d2