[PATCH 02/27] dmaengine: ste_dma: use pm_runtime_last_busy_and_autosuspend helper

From: Vinod Koul
Date: Wed Sep 24 2014 - 12:55:51 EST


Use the new pm_runtime_last_busy_and_autosuspend helper instead of open
coding the same code

Signed-off-by: Vinod Koul <vinod.koul@xxxxxxxxx>
---
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

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/