mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-11-25 07:50:51 +07:00
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>
This commit is contained in:
parent
d234d2123f
commit
c29536e85b
@ -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;
|
||||
|
@ -1128,16 +1128,8 @@ static int _mmc_sd_resume(struct mmc_host *host)
|
||||
*/
|
||||
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;
|
||||
|
Loading…
Reference in New Issue
Block a user