aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mmc/host/dw_mmc.c
diff options
context:
space:
mode:
authorUlf Hansson <ulf.hansson@linaro.org>2013-09-25 07:10:41 -0400
committerChris Ball <cjb@laptop.org>2013-10-30 20:26:39 -0400
commit1eeaadf3fe23f2f7271c9746d3cb65db56816360 (patch)
tree6d12a8f01b7bef7bd5681ca8de3cd863f8c22345 /drivers/mmc/host/dw_mmc.c
parent5ffdeea522c8349ac96a11ec8e19486354fda808 (diff)
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: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc/host/dw_mmc.c')
-rw-r--r--drivers/mmc/host/dw_mmc.c21
1 files changed, 0 insertions, 21 deletions
diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
index 0a6a51238b7f..4bce0deec362 100644
--- a/drivers/mmc/host/dw_mmc.c
+++ b/drivers/mmc/host/dw_mmc.c
@@ -2696,23 +2696,6 @@ EXPORT_SYMBOL(dw_mci_remove);
2696 */ 2696 */
2697int dw_mci_suspend(struct dw_mci *host) 2697int dw_mci_suspend(struct dw_mci *host)
2698{ 2698{
2699 int i, ret = 0;
2700
2701 for (i = 0; i < host->num_slots; i++) {
2702 struct dw_mci_slot *slot = host->slot[i];
2703 if (!slot)
2704 continue;
2705 ret = mmc_suspend_host(slot->mmc);
2706 if (ret < 0) {
2707 while (--i >= 0) {
2708 slot = host->slot[i];
2709 if (slot)
2710 mmc_resume_host(host->slot[i]->mmc);
2711 }
2712 return ret;
2713 }
2714 }
2715
2716 if (host->vmmc) 2699 if (host->vmmc)
2717 regulator_disable(host->vmmc); 2700 regulator_disable(host->vmmc);
2718 2701
@@ -2765,10 +2748,6 @@ int dw_mci_resume(struct dw_mci *host)
2765 dw_mci_set_ios(slot->mmc, &slot->mmc->ios); 2748 dw_mci_set_ios(slot->mmc, &slot->mmc->ios);
2766 dw_mci_setup_bus(slot, true); 2749 dw_mci_setup_bus(slot, true);
2767 } 2750 }
2768
2769 ret = mmc_resume_host(host->slot[i]->mmc);
2770 if (ret < 0)
2771 return ret;
2772 } 2751 }
2773 return 0; 2752 return 0;
2774} 2753}