mmc: sdhci: 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.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Chris Ball <cjb@laptop.org>

1 files changed, 2 insertions, 18 deletions

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index a21a71056dd0..6785fb1dc5c6 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -2556,8 +2556,6 @@ EXPORT_SYMBOL_GPL(sdhci_disable_irq_wakeups);
 
 int sdhci_suspend_host(struct sdhci_host *host)
 {
-        int ret;
-
         if (host->ops->platform_suspend)
                 host->ops->platform_suspend(host);
 
@@ -2569,19 +2567,6 @@ int sdhci_suspend_host(struct sdhci_host *host)
                 host->flags &= ~SDHCI_NEEDS_RETUNING;
         }
 
-        ret = mmc_suspend_host(host->mmc);
-        if (ret) {
-                if (host->flags & SDHCI_USING_RETUNING_TIMER) {
-                        host->flags |= SDHCI_NEEDS_RETUNING;
-                        mod_timer(&host->tuning_timer, jiffies +
-                                        host->tuning_count * HZ);
-                }
-
-                sdhci_enable_card_detection(host);
-
-                return ret;
-        }
-
         if (!device_may_wakeup(mmc_dev(host->mmc))) {
                 sdhci_mask_irqs(host, SDHCI_INT_ALL_MASK);
                 free_irq(host->irq, host);
@@ -2589,14 +2574,14 @@ int sdhci_suspend_host(struct sdhci_host *host)
                 sdhci_enable_irq_wakeups(host);
                 enable_irq_wake(host->irq);
         }
-        return ret;
+        return 0;
 }
 
 EXPORT_SYMBOL_GPL(sdhci_suspend_host);
 
 int sdhci_resume_host(struct sdhci_host *host)
 {
-        int ret;
+        int ret = 0;
 
         if (host->flags & (SDHCI_USE_SDMA | SDHCI_USE_ADMA)) {
                 if (host->ops->enable_dma)
@@ -2625,7 +2610,6 @@ int sdhci_resume_host(struct sdhci_host *host)
                 mmiowb();
         }
 
-        ret = mmc_resume_host(host->mmc);
         sdhci_enable_card_detection(host);
 
         if (host->ops->platform_resume)