On Thu, Jun 20, 2024 at 4:40 PM Geert Uytterhoeven
<geert+renesas@xxxxxxxxx> wrote:
>
> Commit ca78476e4888f1f1 ("mfd: Remove toshiba tmio drivers") removed the
> last users of the .set_pwr() callback in the tmio_mmc_data structure.
> Remove the callback, and all related infrastructure.
>
> Signed-off-by: Geert Uytterhoeven <geert+renesas@xxxxxxxxx>
> ---
> Laurent tried this before in commit 3af9d15c719017fe
> ("mmc: tmio-mmc: Remove .set_pwr() callback from platform data"),
> but it had to be reverted in commit 9d731e7539713acc ("Revert
> "mmc: tmio-mmc: Remove .set_pwr() callback from platform data"")
> because there were still users at that time.
> ---
> drivers/mmc/host/tmio_mmc.h | 3 ---
> drivers/mmc/host/tmio_mmc_core.c | 8 --------
> include/linux/mfd/tmio.h | 1 -
> 3 files changed, 12 deletions(-)
>
Reviewed-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@xxxxxxxxxxxxxx>
Cheers,
Prabhakar
> diff --git a/drivers/mmc/host/tmio_mmc.h b/drivers/mmc/host/tmio_mmc.h
> index de56e6534aeaaa10..2af5730c21f4a98d 100644
> --- a/drivers/mmc/host/tmio_mmc.h
> +++ b/drivers/mmc/host/tmio_mmc.h
> @@ -139,9 +139,6 @@ struct tmio_mmc_host {
> struct mmc_host *mmc;
> struct mmc_host_ops ops;
>
> - /* Callbacks for clock / power control */
> - void (*set_pwr)(struct platform_device *host, int state);
> -
> /* pio related stuff */
> struct scatterlist *sg_ptr;
> struct scatterlist *sg_orig;
> diff --git a/drivers/mmc/host/tmio_mmc_core.c b/drivers/mmc/host/tmio_mmc_core.c
> index 93e912afd3ae5aa0..7b4256f0cbe77028 100644
> --- a/drivers/mmc/host/tmio_mmc_core.c
> +++ b/drivers/mmc/host/tmio_mmc_core.c
> @@ -880,9 +880,6 @@ static void tmio_mmc_power_on(struct tmio_mmc_host *host, unsigned short vdd)
>
> /* .set_ios() is returning void, so, no chance to report an error */
>
> - if (host->set_pwr)
> - host->set_pwr(host->pdev, 1);
> -
> if (!IS_ERR(mmc->supply.vmmc)) {
> ret = mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, vdd);
> /*
> @@ -916,9 +913,6 @@ static void tmio_mmc_power_off(struct tmio_mmc_host *host)
>
> if (!IS_ERR(mmc->supply.vmmc))
> mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, 0);
> -
> - if (host->set_pwr)
> - host->set_pwr(host->pdev, 0);
> }
>
> static unsigned int tmio_mmc_get_timeout_cycles(struct tmio_mmc_host *host)
> @@ -1160,8 +1154,6 @@ int tmio_mmc_host_probe(struct tmio_mmc_host *_host)
> if (pdata->flags & TMIO_MMC_USE_BUSY_TIMEOUT && !_host->get_timeout_cycles)
> _host->get_timeout_cycles = tmio_mmc_get_timeout_cycles;
>
> - _host->set_pwr = pdata->set_pwr;
> -
> ret = tmio_mmc_init_ocr(_host);
> if (ret < 0)
> return ret;
> diff --git a/include/linux/mfd/tmio.h b/include/linux/mfd/tmio.h
> index aca74ac1ff69e6f7..8c09d14a3a286ca0 100644
> --- a/include/linux/mfd/tmio.h
> +++ b/include/linux/mfd/tmio.h
> @@ -100,7 +100,6 @@ struct tmio_mmc_data {
> dma_addr_t dma_rx_offset;
> unsigned int max_blk_count;
> unsigned short max_segs;
> - void (*set_pwr)(struct platform_device *host, int state);
> };
>
> /*
> --
> 2.34.1
>
>
