mmc: core: Make runtime resume default behavior for MMC/SD

MMC_CAP_RUNTIME_RESUME was invented to decrease system PM resume time for
systems that particularly needs this. As the feature has matured let's
make it the default behavior for MMC/SD.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

1 files changed, 2 insertions, 13 deletions

diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
index 141eaa923e18..8f3b46a56b3d 100644
--- a/drivers/mmc/core/sd.c
+++ b/drivers/mmc/core/sd.c
@@ -1128,16 +1128,8 @@ out:
  */
 static int mmc_sd_resume(struct mmc_host *host)
 {
-        int err = 0;
-
-        if (!(host->caps & MMC_CAP_RUNTIME_RESUME)) {
-                err = _mmc_sd_resume(host);
-                pm_runtime_set_active(&host->card->dev);
-                pm_runtime_mark_last_busy(&host->card->dev);
-        }
         pm_runtime_enable(&host->card->dev);
-
-        return err;
+        return 0;
 }
 
 /*
@@ -1165,12 +1157,9 @@ static int mmc_sd_runtime_resume(struct mmc_host *host)
 {
         int err;
 
-        if (!(host->caps & (MMC_CAP_AGGRESSIVE_PM | MMC_CAP_RUNTIME_RESUME)))
-                return 0;
-
         err = _mmc_sd_resume(host);
         if (err)
-                pr_err("%s: error %d doing aggressive resume\n",
+                pr_err("%s: error %d doing runtime resume\n",
                         mmc_hostname(host), err);
 
         return 0;