Commit 3b8bee2a authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Vinod Koul
Browse files

dmaengine: ti: k3-udma: Do not use ring_get_occ in udma_pop_from_ring 



The ring_get_occ is redundant as the k3_ringacc_ring_pop() is also
checking the occ of the ring.

With removing the ring_get_occ, the function can be simplified as well.

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Reviewed-by: default avatarGrygorii Strashko <grygorii.strashko@ti.com>
Link: https://lore.kernel.org/r/20200707102352.28773-3-peter.ujfalusi@ti.com


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent 2166d960

drivers/dma/ti/k3-udma.c

+13 −15
Original line number Diff line number Diff line
@@ -588,7 +588,7 @@ static bool udma_desc_is_rx_flush(struct udma_chan *uc, dma_addr_t addr) 
static int udma_pop_from_ring(struct udma_chan *uc, dma_addr_t *addr)

{

	struct k3_ring *ring = NULL;

	int ret = -ENOENT;

	int ret;



	switch (uc->config.dir) {

	case DMA_DEV_TO_MEM:
@@ -599,10 +599,9 @@ static int udma_pop_from_ring(struct udma_chan *uc, dma_addr_t *addr) 
		ring = uc->tchan->tc_ring;

		break;

	default:

		break;

		return -ENOENT;

	}



	if (ring && k3_ringacc_ring_get_occ(ring)) {

	ret = k3_ringacc_ring_pop(ring, addr);

	if (ret)

		return ret;
@@ -611,14 +610,13 @@ static int udma_pop_from_ring(struct udma_chan *uc, dma_addr_t *addr) 


	/* Teardown completion */

	if (cppi5_desc_is_tdcm(*addr))

			return ret;

		return 0;



	/* Check for flush descriptor */

	if (udma_desc_is_rx_flush(uc, *addr))

		return -ENOENT;

	}



	return ret;

	return 0;

}



static void udma_reset_rings(struct udma_chan *uc)