+ MFD maintainer
On 13 January 2015 at 05:58, Kuninori Morimoto
<kuninori.morimoto.gx@xxxxxxxxxxx> wrote:
> From: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
>
> 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@xxxxxxxxxxx>
> ---
> drivers/mmc/host/sh_mobile_sdhi.c | 2 +-
> drivers/mmc/host/tmio_mmc.h | 1 +
> drivers/mmc/host/tmio_mmc_pio.c | 4 ++--
> include/linux/mfd/tmio.h | 3 +--
> 4 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/mmc/host/sh_mobile_sdhi.c b/drivers/mmc/host/sh_mobile_sdhi.c
> index 87af77d..5e02a6a 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 5cd2986..28234ec 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 1528c88..94fbf4a 100644
> --- a/drivers/mmc/host/tmio_mmc_pio.c
> +++ b/drivers/mmc/host/tmio_mmc_pio.c
> @@ -1247,8 +1247,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;
> }
> diff --git a/include/linux/mfd/tmio.h b/include/linux/mfd/tmio.h
> index 472587a..a3f78da 100644
> --- a/include/linux/mfd/tmio.h
> +++ b/include/linux/mfd/tmio.h
> @@ -125,8 +125,7 @@ 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);
> - /* clock management callbacks */
> - void (*clk_disable)(struct platform_device *pdev);
> +
> int (*multi_io_quirk)(struct mmc_card *card,
> unsigned int direction, int blk_size);
> };
> --
> 1.7.9.5
>
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
