mmc: sh_mmcif: remove redundant .down_pwr() callback
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Fri, 20 Apr 2012 07:01:05 +0000 (09:01 +0200)
committerChris Ball <cjb@laptop.org>
Sat, 21 Jul 2012 04:02:14 +0000 (00:02 -0400)
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>
drivers/mmc/host/sh_mmcif.c

index 3ffb92fc084ed6741ce26784f7e7165e188c2d29..468027665edeb7c7d39c82c5fe73e7b1c42eccb7 100644 (file)
@@ -957,8 +957,8 @@ static void sh_mmcif_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
                        pm_runtime_put(&host->pd->dev);
                        clk_disable(host->hclk);
                        host->power = false;
-                       if (p->down_pwr && ios->power_mode == MMC_POWER_OFF)
-                               p->down_pwr(host->pd);
+                       if (p->set_pwr && ios->power_mode == MMC_POWER_OFF)
+                               p->set_pwr(host->pd, 0);
                }
                host->state = STATE_IDLE;
                return;