Merge "mmc: card: blk: Add support for deferred SD bus resume"

This commit is contained in:
Linux Build Service Account 2017-08-03 10:07:56 -07:00 committed by Gerrit - the friendly Code Review server
commit 071e7f4168

View file

@ -4623,6 +4623,10 @@ static int mmc_blk_probe(struct mmc_card *card)
dev_set_drvdata(&card->dev, md);
#ifdef CONFIG_MMC_BLOCK_DEFERRED_RESUME
mmc_set_bus_resume_policy(card->host, 1);
#endif
if (mmc_add_disk(md))
goto out;
@ -4666,6 +4670,9 @@ static void mmc_blk_remove(struct mmc_card *card)
pm_runtime_put_noidle(&card->dev);
mmc_blk_remove_req(md);
dev_set_drvdata(&card->dev, NULL);
#ifdef CONFIG_MMC_BLOCK_DEFERRED_RESUME
mmc_set_bus_resume_policy(card->host, 0);
#endif
}
static int _mmc_blk_suspend(struct mmc_card *card, bool wait)