mmc: tmio: tmio_mmc_host has .clk_enable

Current .clk_enable is implemented under tmio_mmc_data.
It goes to tmio_mmc_host by this patch.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

3 files changed, 4 insertions, 4 deletions

diff --git a/drivers/mmc/host/sh_mobile_sdhi.c b/drivers/mmc/host/sh_mobile_sdhi.c
index 77ff0620912e..87af77dd660b 100644
--- a/drivers/mmc/host/sh_mobile_sdhi.c
+++ b/drivers/mmc/host/sh_mobile_sdhi.c
@@ -215,8 +215,8 @@ static int sh_mobile_sdhi_probe(struct platform_device *pdev)
 
         host->dma               = dma_priv;
         host->write16_hook      = sh_mobile_sdhi_write16_hook;
+        host->clk_enable        = sh_mobile_sdhi_clk_enable;
 
-        mmc_data->clk_enable = sh_mobile_sdhi_clk_enable;
         mmc_data->clk_disable = sh_mobile_sdhi_clk_disable;
         mmc_data->capabilities = MMC_CAP_MMC_HIGHSPEED;
         mmc_data->multi_io_quirk = sh_mobile_sdhi_multi_io_quirk;
diff --git a/drivers/mmc/host/tmio_mmc.h b/drivers/mmc/host/tmio_mmc.h
index 3fa96b11f76c..5cd298665b94 100644
--- a/drivers/mmc/host/tmio_mmc.h
+++ b/drivers/mmc/host/tmio_mmc.h
@@ -96,6 +96,7 @@ struct tmio_mmc_host {
         bool                    sdio_irq_enabled;
 
         int (*write16_hook)(struct tmio_mmc_host *host, int addr);
+        int (*clk_enable)(struct platform_device *pdev, unsigned int *f);
 };
 
 struct tmio_mmc_host *tmio_mmc_host_alloc(struct platform_device *pdev);
diff --git a/drivers/mmc/host/tmio_mmc_pio.c b/drivers/mmc/host/tmio_mmc_pio.c
index 58f4e47aac8c..38bcf0ca31c5 100644
--- a/drivers/mmc/host/tmio_mmc_pio.c
+++ b/drivers/mmc/host/tmio_mmc_pio.c
@@ -835,13 +835,12 @@ fail:
 static int tmio_mmc_clk_update(struct tmio_mmc_host *host)
 {
         struct mmc_host *mmc = host->mmc;
-        struct tmio_mmc_data *pdata = host->pdata;
         int ret;
 
-        if (!pdata->clk_enable)
+        if (!host->clk_enable)
                 return -ENOTSUPP;
 
-        ret = pdata->clk_enable(host->pdev, &mmc->f_max);
+        ret = host->clk_enable(host->pdev, &mmc->f_max);
         if (!ret)
                 mmc->f_min = mmc->f_max / 512;