diff options
author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2012-04-20 03:01:05 -0400 |
---|---|---|
committer | Chris Ball <cjb@laptop.org> | 2012-07-21 00:02:14 -0400 |
commit | e2ee996eaad64c149cb7cfd344789c7e0c1577dc (patch) | |
tree | d4e6e2d11fbdaeb04e3728a9822e870fff7eb688 | |
parent | a6609267107ecc5598b79aa353036c1f57e7257e (diff) |
mmc: sh_mmcif: remove redundant .down_pwr() callback
From the original version of sh_mmcif the .set_pwr() callback has only been
used to turn the card's power on, and the .down_pwr() callback has been
used to turn it off. .set_pwr() can be used for both these tasks, which is
also how it is implemented by the only user of this API: the SH7724 ecovec
board.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Reviewed-by: Simon Horman <horms@verge.net.au>
Signed-off-by: Chris Ball <cjb@laptop.org>
-rw-r--r-- | drivers/mmc/host/sh_mmcif.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c index 3ffb92fc084e..468027665ede 100644 --- a/drivers/mmc/host/sh_mmcif.c +++ b/drivers/mmc/host/sh_mmcif.c | |||
@@ -957,8 +957,8 @@ static void sh_mmcif_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) | |||
957 | pm_runtime_put(&host->pd->dev); | 957 | pm_runtime_put(&host->pd->dev); |
958 | clk_disable(host->hclk); | 958 | clk_disable(host->hclk); |
959 | host->power = false; | 959 | host->power = false; |
960 | if (p->down_pwr && ios->power_mode == MMC_POWER_OFF) | 960 | if (p->set_pwr && ios->power_mode == MMC_POWER_OFF) |
961 | p->down_pwr(host->pd); | 961 | p->set_pwr(host->pd, 0); |
962 | } | 962 | } |
963 | host->state = STATE_IDLE; | 963 | host->state = STATE_IDLE; |
964 | return; | 964 | return; |