mmc: tmio: tmio_mmc_host has .clk_disable

Current .clk_disable 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, 3 deletions

diff --git a/drivers/mmc/host/sh_mobile_sdhi.c b/drivers/mmc/host/sh_mobile_sdhi.c
index 87af77dd660b..5e02a6a302e7 100644
--- a/drivers/mmc/host/sh_mobile_sdhi.c
+++ b/drivers/mmc/host/sh_mobile_sdhi.c
@@ -216,8 +216,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;
+        host->clk_disable       = sh_mobile_sdhi_clk_disable;
 
-        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;
         if (p) {
diff --git a/drivers/mmc/host/tmio_mmc.h b/drivers/mmc/host/tmio_mmc.h
index 5cd298665b94..28234ec5caa3 100644
--- a/drivers/mmc/host/tmio_mmc.h
+++ b/drivers/mmc/host/tmio_mmc.h
@@ -97,6 +97,7 @@ struct tmio_mmc_host {
 
         int (*write16_hook)(struct tmio_mmc_host *host, int addr);
         int (*clk_enable)(struct platform_device *pdev, unsigned int *f);
+        void (*clk_disable)(struct platform_device *pdev);
 };
 
 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 38bcf0ca31c5..e33eb8ee5eb5 100644
--- a/drivers/mmc/host/tmio_mmc_pio.c
+++ b/drivers/mmc/host/tmio_mmc_pio.c
@@ -1249,8 +1249,8 @@ int tmio_mmc_host_runtime_suspend(struct device *dev)
         if (host->clk_cache)
                 tmio_mmc_clk_stop(host);
 
-        if (host->pdata->clk_disable)
-                host->pdata->clk_disable(host->pdev);
+        if (host->clk_disable)
+                host->clk_disable(host->pdev);
 
         return 0;
 }