aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlf Hansson <ulf.hansson@linaro.org>2015-06-01 05:14:57 -0400
committerUlf Hansson <ulf.hansson@linaro.org>2015-06-04 04:03:51 -0400
commit364549ddc29dd5490e81039cb85fbf0123365754 (patch)
treed8bf469d91782202471510557909da9cd5d71669
parent1e5a0a9a58e2977e6542074b25b96be93208dccf (diff)
mmc: core: Remove redundant ->power_restore() callback for MMC
Since the ->reset() callback is implemented for MMC, the ->power_restore() callback has become redundant, let's remove it. Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
-rw-r--r--drivers/mmc/core/mmc.c14
1 files changed, 1 insertions, 13 deletions
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index e519e3110a20..e726903170a8 100644
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -1910,17 +1910,6 @@ static int mmc_runtime_resume(struct mmc_host *host)
1910 return 0; 1910 return 0;
1911} 1911}
1912 1912
1913static int mmc_power_restore(struct mmc_host *host)
1914{
1915 int ret;
1916
1917 mmc_claim_host(host);
1918 ret = mmc_init_card(host, host->card->ocr, host->card);
1919 mmc_release_host(host);
1920
1921 return ret;
1922}
1923
1924int mmc_can_reset(struct mmc_card *card) 1913int mmc_can_reset(struct mmc_card *card)
1925{ 1914{
1926 u8 rst_n_function; 1915 u8 rst_n_function;
@@ -1958,7 +1947,7 @@ static int mmc_reset(struct mmc_host *host)
1958 mmc_set_initial_state(host); 1947 mmc_set_initial_state(host);
1959 mmc_host_clk_release(host); 1948 mmc_host_clk_release(host);
1960 1949
1961 return mmc_power_restore(host); 1950 return mmc_init_card(host, card->ocr, card);
1962} 1951}
1963 1952
1964static const struct mmc_bus_ops mmc_ops = { 1953static const struct mmc_bus_ops mmc_ops = {
@@ -1968,7 +1957,6 @@ static const struct mmc_bus_ops mmc_ops = {
1968 .resume = mmc_resume, 1957 .resume = mmc_resume,
1969 .runtime_suspend = mmc_runtime_suspend, 1958 .runtime_suspend = mmc_runtime_suspend,
1970 .runtime_resume = mmc_runtime_resume, 1959 .runtime_resume = mmc_runtime_resume,
1971 .power_restore = mmc_power_restore,
1972 .alive = mmc_alive, 1960 .alive = mmc_alive,
1973 .shutdown = mmc_shutdown, 1961 .shutdown = mmc_shutdown,
1974 .reset = mmc_reset, 1962 .reset = mmc_reset,