RE: [PATCH 6/9] dmaengine: consolidate tx_status functions

On Tuesday, March 06, 2012 3:35 PM, Russell King wrote:

Now that we have the completed cookie in the dma_chan structure, we
can consolidate the tx_status functions by providing a function to set
the txstate structure and returning the DMA status.  We also provide
a separate helper to set the residue for cookies which are still in
progress.

Signed-off-by: Russell King <redacted>
---

<snip>

 drivers/dma/dmaengine.h     |   31 +++++++++++++++++++++++++++++++

<snip>

 drivers/dma/ep93xx_dma.c    |    7 +------

<snip>

c_tx_descriptor *tx)

 	tx->cookie =3D 0;
 }
=20
+/**
+ * dma_cookie_status - report cookie status
+ * @chan: dma channel
+ * @cookie: cookie we are interested in
+ * @state: dma_tx_state structure to return last/used cookies
+ *
+ * Report the status of the cookie, filling in the state structure if
+ * non-NULL.  No locking is required.
+ */
+static inline enum dma_status dma_cookie_status(struct dma_chan *chan,
+	dma_cookie_t cookie, struct dma_tx_state *state)
+{
+	dma_cookie_t used, complete;
+
+	used =3D chan->cookie;
+	complete =3D chan->completed_cookie;
+	barrier();
+	if (state) {
+		state->last =3D complete;
+		state->used =3D used;
+		state->residue =3D 0;
+	}
+	return dma_async_is_complete(cookie, complete, used);
+}
+
+static inline void dma_set_residue(struct dma_tx_state *state, u32 resid=

ue)

<snip>

t dma_chan *chan,

 					    struct dma_tx_state *state)
 {
 	struct ep93xx_dma_chan *edmac =3D to_ep93xx_dma_chan(chan);
-	dma_cookie_t last_used, last_completed;
 	enum dma_status ret;
 	unsigned long flags;
=20
 	spin_lock_irqsave(&edmac->lock, flags);
-	last_used =3D chan->cookie;
-	last_completed =3D chan->completed_cookie;
+	ret =3D dma_cookie_status(chan, cookie, state);
 	spin_unlock_irqrestore(&edmac->lock, flags);
=20
-	ret =3D dma_async_is_complete(cookie, last_completed, last_used);
-	dma_set_tx_state(state, last_completed, last_used, 0);
-
 	return ret;
 }
=20

For ep93xx:

Tested-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com>