mmc: tmio: tmio_mmc_host has .write16_hook

Current .write16_hook 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, 5 insertions, 3 deletions

diff --git a/drivers/mmc/host/sh_mobile_sdhi.c b/drivers/mmc/host/sh_mobile_sdhi.c
index 288e78d2c7a1..77ff0620912e 100644
--- a/drivers/mmc/host/sh_mobile_sdhi.c
+++ b/drivers/mmc/host/sh_mobile_sdhi.c
@@ -214,11 +214,11 @@ static int sh_mobile_sdhi_probe(struct platform_device *pdev)
         }
 
         host->dma               = dma_priv;
+        host->write16_hook      = sh_mobile_sdhi_write16_hook;
 
         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->write16_hook = sh_mobile_sdhi_write16_hook;
         mmc_data->multi_io_quirk = sh_mobile_sdhi_multi_io_quirk;
         if (p) {
                 mmc_data->flags = p->tmio_flags;
diff --git a/drivers/mmc/host/tmio_mmc.h b/drivers/mmc/host/tmio_mmc.h
index 49a2559ff489..3fa96b11f76c 100644
--- a/drivers/mmc/host/tmio_mmc.h
+++ b/drivers/mmc/host/tmio_mmc.h
@@ -94,6 +94,8 @@ struct tmio_mmc_host {
         struct mutex            ios_lock;       /* protect set_ios() context */
         bool                    native_hotplug;
         bool                    sdio_irq_enabled;
+
+        int (*write16_hook)(struct tmio_mmc_host *host, int addr);
 };
 
 struct tmio_mmc_host *tmio_mmc_host_alloc(struct platform_device *pdev);
@@ -183,7 +185,7 @@ static inline void sd_ctrl_write16(struct tmio_mmc_host *host, int addr, u16 val
         /* If there is a hook and it returns non-zero then there
          * is an error and the write should be skipped
          */
-        if (host->pdata->write16_hook && host->pdata->write16_hook(host, addr))
+        if (host->write16_hook && host->write16_hook(host, addr))
                 return;
         writew(val, host->ctl + (addr << host->pdata->bus_shift));
 }
diff --git a/drivers/mmc/host/tmio_mmc_pio.c b/drivers/mmc/host/tmio_mmc_pio.c
index 396be0e95a98..58f4e47aac8c 100644
--- a/drivers/mmc/host/tmio_mmc_pio.c
+++ b/drivers/mmc/host/tmio_mmc_pio.c
@@ -1092,7 +1092,7 @@ int tmio_mmc_host_probe(struct tmio_mmc_host *_host,
         tmio_mmc_of_parse(pdev, pdata);
 
         if (!(pdata->flags & TMIO_MMC_HAS_IDLE_WAIT))
-                pdata->write16_hook = NULL;
+                _host->write16_hook = NULL;
 
         res_ctl = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         if (!res_ctl)