From: Vinod Koul <vinod.koul@intel.com>
To: linux-kernel@vger.kernel.org
Cc: subhransu.s.prusty@intel.com, vinod.koul@intel.com,
Linus Walleij <linus.walleij@linaro.org>,
Dan Williams <dan.j.williams@intel.com>,
linux-arm-kernel@lists.infradead.org, dmaengine@vger.kernel.org
Subject: [PATCH 02/27] dmaengine: ste_dma: use pm_runtime_last_busy_and_autosuspend helper
Date: Wed, 24 Sep 2014 21:44:52 +0530 [thread overview]
Message-ID: <1411575342-31048-3-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
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
---
drivers/dma/ste_dma40.c | 30 ++++++++++--------------------
1 files changed, 10 insertions(+), 20 deletions(-)
diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c
index 5fe5933..621b941 100644
--- a/drivers/dma/ste_dma40.c
+++ b/drivers/dma/ste_dma40.c
@@ -1442,8 +1442,7 @@ static int d40_pause(struct d40_chan *d40c)
res = d40_channel_execute_command(d40c, D40_DMA_SUSPEND_REQ);
- pm_runtime_mark_last_busy(d40c->base->dev);
- pm_runtime_put_autosuspend(d40c->base->dev);
+ pm_runtime_last_busy_and_autosuspend(d40c->base->dev);
spin_unlock_irqrestore(&d40c->lock, flags);
return res;
}
@@ -1463,8 +1462,7 @@ static int d40_resume(struct d40_chan *d40c)
if (d40_residue(d40c) || d40_tx_is_linked(d40c))
res = d40_channel_execute_command(d40c, D40_DMA_RUN);
- pm_runtime_mark_last_busy(d40c->base->dev);
- pm_runtime_put_autosuspend(d40c->base->dev);
+ pm_runtime_last_busy_and_autosuspend(d40c->base->dev);
spin_unlock_irqrestore(&d40c->lock, flags);
return res;
}
@@ -1565,8 +1563,7 @@ static void dma_tc_handle(struct d40_chan *d40c)
if (d40_queue_start(d40c) == NULL) {
d40c->busy = false;
- pm_runtime_mark_last_busy(d40c->base->dev);
- pm_runtime_put_autosuspend(d40c->base->dev);
+ pm_runtime_last_busy_and_autosuspend(d40c->base->dev);
}
d40_desc_remove(d40d);
@@ -2045,18 +2042,15 @@ static int d40_free_dma(struct d40_chan *d40c)
else
d40c->base->lookup_phy_chans[phy->num] = NULL;
- if (d40c->busy) {
- pm_runtime_mark_last_busy(d40c->base->dev);
- pm_runtime_put_autosuspend(d40c->base->dev);
- }
+ if (d40c->busy)
+ pm_runtime_last_busy_and_autosuspend(d40c->base->dev);
d40c->busy = false;
d40c->phy_chan = NULL;
d40c->configured = false;
out:
- pm_runtime_mark_last_busy(d40c->base->dev);
- pm_runtime_put_autosuspend(d40c->base->dev);
+ pm_runtime_last_busy_and_autosuspend(d40c->base->dev);
return res;
}
@@ -2457,8 +2451,7 @@ static int d40_alloc_chan_resources(struct dma_chan *chan)
if (is_free_phy)
d40_config_write(d40c);
fail:
- pm_runtime_mark_last_busy(d40c->base->dev);
- pm_runtime_put_autosuspend(d40c->base->dev);
+ pm_runtime_last_busy_and_autosuspend(d40c->base->dev);
spin_unlock_irqrestore(&d40c->lock, flags);
return err;
}
@@ -2618,12 +2611,9 @@ static void d40_terminate_all(struct dma_chan *chan)
chan_err(d40c, "Failed to stop channel\n");
d40_term_all(d40c);
- pm_runtime_mark_last_busy(d40c->base->dev);
- pm_runtime_put_autosuspend(d40c->base->dev);
- if (d40c->busy) {
- pm_runtime_mark_last_busy(d40c->base->dev);
- pm_runtime_put_autosuspend(d40c->base->dev);
- }
+ pm_runtime_last_busy_and_autosuspend(d40c->base->dev);
+ if (d40c->busy)
+ pm_runtime_last_busy_and_autosuspend(d40c->base->dev);
d40c->busy = false;
spin_unlock_irqrestore(&d40c->lock, flags);
--
1.7.0.4
next prev parent reply other threads:[~2014-09-24 16:46 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 ` Vinod Koul [this message]
2014-09-25 13:19 ` [PATCH 02/27] dmaengine: ste_dma: use pm_runtime_last_busy_and_autosuspend helper 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 ` [PATCH 16/27] mmc: omap_hsmmc: " Vinod Koul
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-3-git-send-email-vinod.koul@intel.com \
--to=vinod.koul@intel.com \
--cc=dan.j.williams@intel.com \
--cc=dmaengine@vger.kernel.org \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=subhransu.s.prusty@intel.com \
/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).