From: Vinod Koul <vinod.koul@intel.com>
To: linux-kernel@vger.kernel.org
Cc: subhransu.s.prusty@intel.com, vinod.koul@intel.com,
Balaji T K <balajitk@ti.com>, Chris Ball <chris@printf.net>,
Ulf Hansson <ulf.hansson@linaro.org>,
linux-mmc@vger.kernel.org, linux-omap@vger.kernel.org
Subject: [PATCH 16/27] mmc: omap_hsmmc: use pm_runtime_last_busy_and_autosuspend helper
Date: Wed, 24 Sep 2014 21:45:06 +0530 [thread overview]
Message-ID: <1411575342-31048-17-git-send-email-vinod.koul@intel.com> (raw)
In-Reply-To: <1411575342-31048-1-git-send-email-vinod.koul@intel.com>
Use the new pm_runtime_last_busy_and_autosuspend helper instead of open
coding the same code
This patch also changes return value from macro rather than 0 always!
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
---
drivers/mmc/host/omap_hsmmc.c | 19 ++++---------------
1 files changed, 4 insertions(+), 15 deletions(-)
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index 9656726..2a2affc 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -1823,10 +1823,7 @@ static int omap_hsmmc_disable_fclk(struct mmc_host *mmc)
{
struct omap_hsmmc_host *host = mmc_priv(mmc);
- pm_runtime_mark_last_busy(host->dev);
- pm_runtime_put_autosuspend(host->dev);
-
- return 0;
+ return pm_runtime_last_busy_and_autosuspend(host->dev);
}
static const struct mmc_host_ops omap_hsmmc_ops = {
@@ -1877,10 +1874,7 @@ static int omap_hsmmc_regs_show(struct seq_file *s, void *data)
seq_printf(s, "CAPA:\t\t0x%08x\n",
OMAP_HSMMC_READ(host->base, CAPA));
- pm_runtime_mark_last_busy(host->dev);
- pm_runtime_put_autosuspend(host->dev);
-
- return 0;
+ return pm_runtime_last_busy_and_autosuspend(host->dev);
}
static int omap_hsmmc_regs_open(struct inode *inode, struct file *file)
@@ -2258,10 +2252,7 @@ static int omap_hsmmc_probe(struct platform_device *pdev)
}
omap_hsmmc_debugfs(mmc);
- pm_runtime_mark_last_busy(host->dev);
- pm_runtime_put_autosuspend(host->dev);
-
- return 0;
+ return pm_runtime_last_busy_and_autosuspend(host->dev);
err_slot_name:
mmc_remove_host(mmc);
@@ -2386,9 +2377,7 @@ static int omap_hsmmc_resume(struct device *dev)
!(host->mmc->pm_flags & MMC_PM_WAKE_SDIO_IRQ))
enable_irq(host->wake_irq);
- pm_runtime_mark_last_busy(host->dev);
- pm_runtime_put_autosuspend(host->dev);
- return 0;
+ return pm_runtime_last_busy_and_autosuspend(host->dev);
}
#else
--
1.7.0.4
next prev parent reply other threads:[~2014-09-24 16:47 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-24 16:14 [PATCH 00/27] add pm_runtime_last_busy_and_autosuspend() helper Vinod Koul
2014-09-24 16:14 ` [PATCH 01/27] PM: Add helper pm_runtime_last_busy_and_autosuspend() Vinod Koul
2014-09-24 17:54 ` Pavel Machek
2014-09-25 8:00 ` Vinod Koul
2014-09-25 8:13 ` Ulf Hansson
2014-09-24 16:14 ` [PATCH 02/27] dmaengine: ste_dma: use pm_runtime_last_busy_and_autosuspend helper Vinod Koul
2014-09-25 13:19 ` Linus Walleij
2014-09-24 16:14 ` [PATCH 03/27] extcon: arizona: " Vinod Koul
2014-09-25 1:05 ` Chanwoo Choi
2014-09-25 8:10 ` Charles Keepax
2014-09-24 16:14 ` [PATCH 04/27] drm/i915: " Vinod Koul
2014-09-24 18:35 ` Daniel Vetter
2014-09-24 16:14 ` [PATCH 05/27] drm/nouveau: " Vinod Koul
2014-09-24 16:14 ` [PATCH 06/27] drm/radeon: " Vinod Koul
2014-09-24 20:37 ` Alex Deucher
2014-09-24 16:14 ` [PATCH 07/27] vga_switcheroo: " Vinod Koul
2014-09-24 20:37 ` Alex Deucher
2014-09-24 16:14 ` [PATCH 08/27] i2c: designware: " Vinod Koul
2014-09-24 16:14 ` [PATCH 09/27] i2c: omap: " Vinod Koul
2014-09-24 16:15 ` [PATCH 10/27] i2c: qup: " Vinod Koul
2014-09-24 16:15 ` [PATCH 11/27] mfd: ab8500-gpadc: " Vinod Koul
2014-09-26 8:38 ` Linus Walleij
2014-10-06 21:40 ` Lee Jones
2014-10-07 7:21 ` Lee Jones
2014-10-07 7:38 ` Vinod Koul
2014-09-24 16:15 ` [PATCH 12/27] mfd: arizona: " Vinod Koul
2014-09-25 8:10 ` Charles Keepax
2014-10-06 21:41 ` Lee Jones
2014-10-07 7:21 ` Lee Jones
2014-09-24 16:15 ` [PATCH 13/27] mei: " Vinod Koul
2014-09-24 16:15 ` [PATCH 14/27] mmc: " Vinod Koul
2014-09-24 16:15 ` [PATCH 15/27] mmc: mmci: " Vinod Koul
2014-09-24 16:15 ` Vinod Koul [this message]
2014-09-24 16:15 ` [PATCH 17/27] mmc: sdhci-pxav3: " Vinod Koul
2014-09-24 16:15 ` [PATCH 18/27] mmc: sdhci: " Vinod Koul
2014-09-24 16:15 ` [PATCH 19/27] NFC: trf7970a: " Vinod Koul
2014-09-24 16:15 ` [PATCH 20/27] pm2301-charger: " Vinod Koul
2014-09-24 16:15 ` [PATCH 21/27] spi: omap2-mcspi: " Vinod Koul
2014-09-24 16:58 ` Mark Brown
2014-09-24 16:39 ` Vinod Koul
2014-09-25 13:03 ` Mark Brown
2014-09-24 16:15 ` [PATCH 22/27] spi: orion: " Vinod Koul
2014-09-25 13:03 ` Mark Brown
2014-09-24 16:15 ` [PATCH 23/27] spi: ti-qspi: " Vinod Koul
2014-09-25 13:04 ` Mark Brown
2014-09-24 16:15 ` [PATCH 24/27] spi: core: " Vinod Koul
2014-09-25 13:04 ` Mark Brown
2014-09-24 16:15 ` [PATCH 25/27] tty: serial: omap: " Vinod Koul
2014-09-24 16:15 ` [PATCH 26/27] usb: musb: omap2430: " Vinod Koul
2014-09-24 16:15 ` [PATCH 27/27] video: fbdev: " Vinod Koul
2014-09-24 20:28 ` [PATCH 00/27] add pm_runtime_last_busy_and_autosuspend() helper Rafael J. Wysocki
2014-09-25 7:46 ` Vinod Koul
[not found] ` <20140925142201.GD28045@saruman>
[not found] ` <20140925142758.GB1316@katana>
2014-09-25 19:54 ` Rafael J. Wysocki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1411575342-31048-17-git-send-email-vinod.koul@intel.com \
--to=vinod.koul@intel.com \
--cc=balajitk@ti.com \
--cc=chris@printf.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=subhransu.s.prusty@intel.com \
--cc=ulf.hansson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).