Skip to content

Commit f86937a

Browse files
geertuUlf Hansson
authored andcommitted
mmc: tmio: Remove obsolete .set_pwr() callback()
Commit ca78476 ("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@glider.be> Acked-by: Lee Jones <lee@kernel.org> Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Tested-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Reviewed-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> Link: https://lore.kernel.org/r/fbbc13ddd19df2c40933ffa3b82fb14841bf1d4c.1718897545.git.geert+renesas@glider.be
1 parent 89f415b commit f86937a

3 files changed

Lines changed: 0 additions & 12 deletions

File tree

drivers/mmc/host/tmio_mmc.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,9 +139,6 @@ struct tmio_mmc_host {
139139
struct mmc_host *mmc;
140140
struct mmc_host_ops ops;
141141

142-
/* Callbacks for clock / power control */
143-
void (*set_pwr)(struct platform_device *host, int state);
144-
145142
/* pio related stuff */
146143
struct scatterlist *sg_ptr;
147144
struct scatterlist *sg_orig;

drivers/mmc/host/tmio_mmc_core.c

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -880,9 +880,6 @@ static void tmio_mmc_power_on(struct tmio_mmc_host *host, unsigned short vdd)
880880

881881
/* .set_ios() is returning void, so, no chance to report an error */
882882

883-
if (host->set_pwr)
884-
host->set_pwr(host->pdev, 1);
885-
886883
if (!IS_ERR(mmc->supply.vmmc)) {
887884
ret = mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, vdd);
888885
/*
@@ -916,9 +913,6 @@ static void tmio_mmc_power_off(struct tmio_mmc_host *host)
916913

917914
if (!IS_ERR(mmc->supply.vmmc))
918915
mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, 0);
919-
920-
if (host->set_pwr)
921-
host->set_pwr(host->pdev, 0);
922916
}
923917

924918
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)
11601154
if (pdata->flags & TMIO_MMC_USE_BUSY_TIMEOUT && !_host->get_timeout_cycles)
11611155
_host->get_timeout_cycles = tmio_mmc_get_timeout_cycles;
11621156

1163-
_host->set_pwr = pdata->set_pwr;
1164-
11651157
ret = tmio_mmc_init_ocr(_host);
11661158
if (ret < 0)
11671159
return ret;

include/linux/mfd/tmio.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ struct tmio_mmc_data {
100100
dma_addr_t dma_rx_offset;
101101
unsigned int max_blk_count;
102102
unsigned short max_segs;
103-
void (*set_pwr)(struct platform_device *host, int state);
104103
};
105104

106105
/*

0 commit comments

Comments
 (0)