[U-Boot] [PATCH] mmc: dw_mmc: change the callback function name.

[Pantelis Antoniou]

Hi Jaehoon,

On Oct 6, 2013, at 12:59 PM, Jaehoon Chung wrote:

> To prevent the confusion, use the get_mmc_clk() instead of mmc_clk().
> get_mmc_clk() is more exactly name.
> 
> Signed-off-by: Jaehoon Chung <jh80.chung at samsung.com>
> ---
> drivers/mmc/dw_mmc.c        |    6 +++---
> drivers/mmc/exynos_dw_mmc.c |    2 +-
> include/dwmmc.h             |    2 +-
> 3 files changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/mmc/dw_mmc.c b/drivers/mmc/dw_mmc.c
> index 9a803a0..174e3b5 100644
> --- a/drivers/mmc/dw_mmc.c
> +++ b/drivers/mmc/dw_mmc.c
> @@ -220,12 +220,12 @@ static int dwmci_setup_bus(struct dwmci_host *host, u32 freq)
> 	if ((freq == host->clock) || (freq == 0))
> 		return 0;
> 	/*
> -	 * If host->mmc_clk didn't define,
> +	 * If host->get_mmc_clk didn't define,
> 	 * then assume that host->bus_hz is source clock value.
> 	 * host->bus_hz should be set from user.
> 	 */
> -	if (host->mmc_clk)
> -		sclk = host->mmc_clk(host->dev_index);
> +	if (host->get_mmc_clk)
> +		sclk = host->get_mmc_clk(host->dev_index);
> 	else if (host->bus_hz)
> 		sclk = host->bus_hz;
> 	else {
> diff --git a/drivers/mmc/exynos_dw_mmc.c b/drivers/mmc/exynos_dw_mmc.c
> index 4ef9fec..1f2c53f 100644
> --- a/drivers/mmc/exynos_dw_mmc.c
> +++ b/drivers/mmc/exynos_dw_mmc.c
> @@ -74,7 +74,7 @@ int exynos_dwmci_add_port(int index, u32 regbase, int bus_width, u32 clksel)
> 
> 	host->clksel = exynos_dwmci_clksel;
> 	host->dev_index = index;
> -	host->mmc_clk = exynos_dwmci_get_clk;
> +	host->get_mmc_clk = exynos_dwmci_get_clk;
> 	/* Add the mmc channel to be registered with mmc core */
> 	if (add_dwmci(host, DWMMC_MAX_FREQ, DWMMC_MIN_FREQ)) {
> 		debug("dwmmc%d registration failed\n", index);
> diff --git a/include/dwmmc.h b/include/dwmmc.h
> index 08ced0b..ecaa763 100644
> --- a/include/dwmmc.h
> +++ b/include/dwmmc.h
> @@ -138,7 +138,7 @@ struct dwmci_host {
> 	struct mmc *mmc;
> 
> 	void (*clksel)(struct dwmci_host *host);
> -	unsigned int (*mmc_clk)(int dev_index);
> +	unsigned int (*get_mmc_clk)(int dev_index);
> };
> 
> struct dwmci_idmac {
> -- 
> 1.7.9.5

Applied, thanks

Acked-by: Pantelis Antoniou <panto at antoniou-consulting.com>