mmc: tmio: tmio_mmc_host has .multi_io_quirk

Current .multi_io_quirk 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>

diff --git a/drivers/mmc/host/sh_mobile_sdhi.c b/drivers/mmc/host/sh_mobile_sdhi.c
index 5e02a6a302e77e7b50414ab4d0ca0e25cac6b47e..c92efe59284d26cc185b748ea52e435a45f7e34b 100644 (file)
--- a/drivers/mmc/host/sh_mobile_sdhi.c
+++ b/drivers/mmc/host/sh_mobile_sdhi.c
@@ -217,9 +217,9 @@ static int sh_mobile_sdhi_probe(struct platform_device *pdev)
        host->write16_hook      = sh_mobile_sdhi_write16_hook;
        host->clk_enable        = sh_mobile_sdhi_clk_enable;
        host->clk_disable       = sh_mobile_sdhi_clk_disable;
+       host->multi_io_quirk    = sh_mobile_sdhi_multi_io_quirk;
 
        mmc_data->capabilities = MMC_CAP_MMC_HIGHSPEED;
-       mmc_data->multi_io_quirk = sh_mobile_sdhi_multi_io_quirk;
        if (p) {
                mmc_data->flags = p->tmio_flags;
                mmc_data->ocr_mask = p->tmio_ocr_mask;

diff --git a/drivers/mmc/host/tmio_mmc.h b/drivers/mmc/host/tmio_mmc.h
index 28234ec5caa32c5d49683a635b3c96aa048a720e..263256c897ed3d8e5af0ed7eab910509529ce96e 100644 (file)
--- a/drivers/mmc/host/tmio_mmc.h
+++ b/drivers/mmc/host/tmio_mmc.h
@@ -98,6 +98,8 @@ 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);
+       int (*multi_io_quirk)(struct mmc_card *card,
+                             unsigned int direction, int blk_size);
 };
 
 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 e33eb8ee5eb5ba6b4b85adec52fadf93ae06c3ed..a31c3573d386f8c6f0a9f4e2143a623081d1d636 100644 (file)
--- a/drivers/mmc/host/tmio_mmc_pio.c
+++ b/drivers/mmc/host/tmio_mmc_pio.c
@@ -1004,10 +1004,9 @@ static int tmio_multi_io_quirk(struct mmc_card *card,
                               unsigned int direction, int blk_size)
 {
        struct tmio_mmc_host *host = mmc_priv(card->host);
-       struct tmio_mmc_data *pdata = host->pdata;
 
-       if (pdata->multi_io_quirk)
-               return pdata->multi_io_quirk(card, direction, blk_size);
+       if (host->multi_io_quirk)
+               return host->multi_io_quirk(card, direction, blk_size);
 
        return blk_size;
 }

diff --git a/include/linux/mfd/tmio.h b/include/linux/mfd/tmio.h
index a3f78da70af7148f52794faa4600e32741dbbebd..3edaa17d1ccde62f2ed826f6d8d05863a5a8cec9 100644 (file)
--- a/include/linux/mfd/tmio.h
+++ b/include/linux/mfd/tmio.h
@@ -125,9 +125,6 @@ struct tmio_mmc_data {
        unsigned int                    cd_gpio;
        void (*set_pwr)(struct platform_device *host, int state);
        void (*set_clk_div)(struct platform_device *host, int state);
-
-       int (*multi_io_quirk)(struct mmc_card *card,
-                             unsigned int direction, int blk_size);
 };
 
 /*