diff mbox

[15/27] mmc: mmci: use pm_runtime_last_busy_and_autosuspend helper

Message ID 1411575342-31048-16-git-send-email-vinod.koul@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Vinod Koul Sept. 24, 2014, 4:15 p.m. UTC 
Use the new pm_runtime_last_busy_and_autosuspend helper instead of open
coding the same code

Signed-off-by: Vinod Koul <vinod.koul@intel.com>
---
 drivers/mmc/host/mmci.c |   12 ++++--------
 1 files changed, 4 insertions(+), 8 deletions(-)
diff mbox

Patch

diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index e4d4707..27dcfba 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -223,8 +223,7 @@  static int mmci_card_busy(struct mmc_host *mmc)
 		busy = 1;
 	spin_unlock_irqrestore(&host->lock, flags);
 
-	pm_runtime_mark_last_busy(mmc_dev(mmc));
-	pm_runtime_put_autosuspend(mmc_dev(mmc));
+	pm_runtime_last_busy_and_autosuspend(mmc_dev(mmc));
 
 	return busy;
 }
@@ -372,8 +371,7 @@  mmci_request_end(struct mmci_host *host, struct mmc_request *mrq)
 
 	mmc_request_done(host->mmc, mrq);
 
-	pm_runtime_mark_last_busy(mmc_dev(host->mmc));
-	pm_runtime_put_autosuspend(mmc_dev(host->mmc));
+	pm_runtime_last_busy_and_autosuspend(mmc_dev(host->mmc));
 }
 
 static void mmci_set_mask1(struct mmci_host *host, unsigned int mask)
@@ -1397,8 +1395,7 @@  static void mmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
 
 	spin_unlock_irqrestore(&host->lock, flags);
 
-	pm_runtime_mark_last_busy(mmc_dev(mmc));
-	pm_runtime_put_autosuspend(mmc_dev(mmc));
+	pm_runtime_last_busy_and_autosuspend(mmc_dev(mmc));
 }
 
 static int mmci_get_cd(struct mmc_host *mmc)
@@ -1442,8 +1439,7 @@  static int mmci_sig_volt_switch(struct mmc_host *mmc, struct mmc_ios *ios)
 		if (ret)
 			dev_warn(mmc_dev(mmc), "Voltage switch failed\n");
 
-		pm_runtime_mark_last_busy(mmc_dev(mmc));
-		pm_runtime_put_autosuspend(mmc_dev(mmc));
+		pm_runtime_last_busy_and_autosuspend(mmc_dev(mmc));
 	}
 
 	return ret;