Cleanups as suggested by wd on mailing list, plus I replaced calloc(...,1) with malloc().
Signed-off-by: Pavel Machek pavel@denx.de
--- a/drivers/mmc/socfpga_dw_mmc.c +++ b/drivers/mmc/socfpga_dw_mmc.c @@ -16,8 +16,6 @@ static const struct socfpga_clock_manager *clock_manager_base = static const struct socfpga_system_manager *system_manager_base = (void *)SOCFPGA_SYSMGR_ADDRESS;
-static char *SOCFPGA_NAME = "SOCFPGA DWMMC"; - #define CLKMGR_PERPLLGRP_EN_SDMMCCLK_MASK (1 << 8)
static void socfpga_dwmci_clksel(struct dwmci_host *host) @@ -47,14 +45,15 @@ static void socfpga_dwmci_clksel(struct dwmci_host *host)
int socfpga_dwmmc_init(u32 regbase, int bus_width, int index) { - struct dwmci_host *host = NULL; - host = calloc(sizeof(struct dwmci_host), 1); + struct dwmci_host *host; + + host = malloc(sizeof(struct dwmci_host)); if (!host) { printf("dwmci_host calloc fail!\n"); return -1; }
- host->name = SOCFPGA_NAME; + host->name = "SOCFPGA DWMMC"; host->ioaddr = (void *)regbase; host->buswidth = bus_width; host->clksel = socfpga_dwmci_clksel;