Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit adfedd9a authored by Vinod Koul's avatar Vinod Koul
Browse files

dmaengine: use DMA_COMPLETE for dma completion status 



the DMA_SUCCESS is a misnomer as dmaengine indicates the transfer is complete and
gives no guarantee of the transfer success. Hence we should use DMA_COMPLTE
instead of DMA_SUCCESS

Acked-by: default avatarDan Williams <dan.j.williams@intel.com>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent e98b3caf

drivers/dma/dmaengine.c

+1 −1
Original line number Diff line number Diff line
@@ -1062,7 +1062,7 @@ dma_wait_for_async_tx(struct dma_async_tx_descriptor *tx) 
	unsigned long dma_sync_wait_timeout = jiffies + msecs_to_jiffies(5000);



	if (!tx)

		return DMA_SUCCESS;

		return DMA_COMPLETE;



	while (tx->cookie == -EBUSY) {

		if (time_after_eq(jiffies, dma_sync_wait_timeout)) {

include/linux/dmaengine.h

+6 −6
Original line number Diff line number Diff line
@@ -45,13 +45,13 @@ static inline int dma_submit_error(dma_cookie_t cookie) 


/**

 * enum dma_status - DMA transaction status

 * @DMA_SUCCESS: transaction completed successfully

 * @DMA_COMPLETE: transaction completed

 * @DMA_IN_PROGRESS: transaction not yet processed

 * @DMA_PAUSED: transaction is paused

 * @DMA_ERROR: transaction failed

 */

enum dma_status {

	DMA_SUCCESS,

	DMA_SUCCESS = 0, DMA_COMPLETE = 0,

	DMA_IN_PROGRESS,

	DMA_PAUSED,

	DMA_ERROR,
@@ -979,10 +979,10 @@ static inline enum dma_status dma_async_is_complete(dma_cookie_t cookie, 
{

	if (last_complete <= last_used) {

		if ((cookie <= last_complete) || (cookie > last_used))

			return DMA_SUCCESS;

			return DMA_COMPLETE;

	} else {

		if ((cookie <= last_complete) && (cookie > last_used))

			return DMA_SUCCESS;

			return DMA_COMPLETE;

	}

	return DMA_IN_PROGRESS;

}
@@ -1013,11 +1013,11 @@ static inline struct dma_chan *dma_find_channel(enum dma_transaction_type tx_typ 
}

static inline enum dma_status dma_sync_wait(struct dma_chan *chan, dma_cookie_t cookie)

{

	return DMA_SUCCESS;

	return DMA_COMPLETE;

}

static inline enum dma_status dma_wait_for_async_tx(struct dma_async_tx_descriptor *tx)

{

	return DMA_SUCCESS;

	return DMA_COMPLETE;

}

static inline void dma_issue_pending_all(void)

{