diff options
author | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2013-08-08 06:38:40 -0400 |
---|---|---|
committer | Chris Ball <cjb@laptop.org> | 2013-08-24 23:58:08 -0400 |
commit | 83a0c7797e96e103bb3b6fcf8afb7b65dc7fc68e (patch) | |
tree | e18bb5206391cce75b3a7e741890735b7f9f179f | |
parent | dcbfaf36c1933d88565501ff13feb0f4b2d38735 (diff) |
mmc: sh_mmcif: Remove .set_pwr() callback from platform data
The .set_pwr() callback isn't used anymore as all platforms register
GPIO-controlled regulators. Remove it.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Chris Ball <cjb@laptop.org>
-rw-r--r-- | drivers/mmc/host/sh_mmcif.c | 3 | ||||
-rw-r--r-- | include/linux/mmc/sh_mmcif.h | 1 |
2 files changed, 0 insertions, 4 deletions
diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c index 35f61cc3a392..ac8e109ac843 100644 --- a/drivers/mmc/host/sh_mmcif.c +++ b/drivers/mmc/host/sh_mmcif.c | |||
@@ -956,11 +956,8 @@ static int sh_mmcif_clk_update(struct sh_mmcif_host *host) | |||
956 | 956 | ||
957 | static void sh_mmcif_set_power(struct sh_mmcif_host *host, struct mmc_ios *ios) | 957 | static void sh_mmcif_set_power(struct sh_mmcif_host *host, struct mmc_ios *ios) |
958 | { | 958 | { |
959 | struct sh_mmcif_plat_data *pd = host->pd->dev.platform_data; | ||
960 | struct mmc_host *mmc = host->mmc; | 959 | struct mmc_host *mmc = host->mmc; |
961 | 960 | ||
962 | if (pd && pd->set_pwr) | ||
963 | pd->set_pwr(host->pd, ios->power_mode != MMC_POWER_OFF); | ||
964 | if (!IS_ERR(mmc->supply.vmmc)) | 961 | if (!IS_ERR(mmc->supply.vmmc)) |
965 | /* Errors ignored... */ | 962 | /* Errors ignored... */ |
966 | mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, | 963 | mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, |
diff --git a/include/linux/mmc/sh_mmcif.h b/include/linux/mmc/sh_mmcif.h index 39011eb42930..767fac5a7d93 100644 --- a/include/linux/mmc/sh_mmcif.h +++ b/include/linux/mmc/sh_mmcif.h | |||
@@ -33,7 +33,6 @@ | |||
33 | */ | 33 | */ |
34 | 34 | ||
35 | struct sh_mmcif_plat_data { | 35 | struct sh_mmcif_plat_data { |
36 | void (*set_pwr)(struct platform_device *pdev, int state); | ||
37 | int (*get_cd)(struct platform_device *pdef); | 36 | int (*get_cd)(struct platform_device *pdef); |
38 | unsigned int slave_id_tx; /* embedded slave_id_[tr]x */ | 37 | unsigned int slave_id_tx; /* embedded slave_id_[tr]x */ |
39 | unsigned int slave_id_rx; | 38 | unsigned int slave_id_rx; |