mmc: dw_mmc: change the callback function name.

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@samsung.com>
Acked-by: Pantelis Antoniou <panto@antoniou-consulting.com>

diff --git a/drivers/mmc/dw_mmc.c b/drivers/mmc/dw_mmc.c
index 9a803a02d4f989b968e30cb076784bf04b6bba6e..174e3b5cba28df3b0e43dbcc844967248c72be71 100644 (file)
--- 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 4ef9fec0e4d1ce90214b8504dff59111ebec4138..1f2c53f214daddea07a40ed5b5896e6c350c5ac3 100644 (file)
--- 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 08ced0bf1f0440cc624915569d1673d311249e89..ecaa76368d8594983a6d49c2a38c8c7fadb44e18 100644 (file)
--- 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 {