Commit 1eeaadf3 authored by Ulf Hansson's avatar Ulf Hansson Committed by Chris Ball

mmc: dw_mmc: Move away from using deprecated APIs

Suspend and resume of cards are being handled from the protocol layer
and consequently the mmc_suspend|resume_host APIs are deprecated.

This means we can simplify the suspend|resume callbacks by removing the
use of the deprecated APIs.

Cc: Seungwon Jeon <tgih.jun@samsung.com>
Cc: Jaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent 5ffdeea5
...@@ -2696,23 +2696,6 @@ EXPORT_SYMBOL(dw_mci_remove); ...@@ -2696,23 +2696,6 @@ EXPORT_SYMBOL(dw_mci_remove);
*/ */
int dw_mci_suspend(struct dw_mci *host) int dw_mci_suspend(struct dw_mci *host)
{ {
int i, ret = 0;
for (i = 0; i < host->num_slots; i++) {
struct dw_mci_slot *slot = host->slot[i];
if (!slot)
continue;
ret = mmc_suspend_host(slot->mmc);
if (ret < 0) {
while (--i >= 0) {
slot = host->slot[i];
if (slot)
mmc_resume_host(host->slot[i]->mmc);
}
return ret;
}
}
if (host->vmmc) if (host->vmmc)
regulator_disable(host->vmmc); regulator_disable(host->vmmc);
...@@ -2765,10 +2748,6 @@ int dw_mci_resume(struct dw_mci *host) ...@@ -2765,10 +2748,6 @@ int dw_mci_resume(struct dw_mci *host)
dw_mci_set_ios(slot->mmc, &slot->mmc->ios); dw_mci_set_ios(slot->mmc, &slot->mmc->ios);
dw_mci_setup_bus(slot, true); dw_mci_setup_bus(slot, true);
} }
ret = mmc_resume_host(host->slot[i]->mmc);
if (ret < 0)
return ret;
} }
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment