diff options
| author | Ulf Hansson <ulf.hansson@linaro.org> | 2015-11-05 16:01:32 +0100 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@linaro.org> | 2015-12-22 11:32:03 +0100 |
| commit | c29536e85b5f7cf42b2e761f7ff35bc97de7cf95 (patch) | |
| tree | 0a232d2996d0cecab2c4bce4cb1d3e2d8e608d47 /drivers/mmc | |
| parent | d234d2123fa734c8018f7d01ed5d663cf5e6f665 (diff) | |
| download | linux-c29536e85b5f7cf42b2e761f7ff35bc97de7cf95.tar.gz linux-c29536e85b5f7cf42b2e761f7ff35bc97de7cf95.tar.bz2 linux-c29536e85b5f7cf42b2e761f7ff35bc97de7cf95.zip | |
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>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/core/mmc.c | 15 | ||||
| -rw-r--r-- | drivers/mmc/core/sd.c | 15 |
2 files changed, 4 insertions, 26 deletions
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c index 3a9a79ec4343..66957addf9e4 100644 --- a/drivers/mmc/core/mmc.c +++ b/drivers/mmc/core/mmc.c @@ -1907,16 +1907,8 @@ static int mmc_shutdown(struct mmc_host *host) */ static int mmc_resume(struct mmc_host *host) { - int err = 0; - - if (!(host->caps & MMC_CAP_RUNTIME_RESUME)) { - err = _mmc_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; } /* @@ -1944,12 +1936,9 @@ static int mmc_runtime_resume(struct mmc_host *host) { int err; - if (!(host->caps & (MMC_CAP_AGGRESSIVE_PM | MMC_CAP_RUNTIME_RESUME))) - return 0; - err = _mmc_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; 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; |