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: Peter Ujfalusi <peter.ujfalusi@ti.com>
Reviewed-by: Grygorii Strashko <grygorii.strashko@ti.com>
Link: https://lore.kernel.org/r/20200707102352.28773-3-peter.ujfalusi@ti.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>

diff --git a/drivers/dma/ti/k3-udma.c b/drivers/dma/ti/k3-udma.c
index f5c1373e9225d7a655d2d850d8d202d6828dd5fb..08f58d7ed8d5084c7009f0bdcd5814f09da03417 100644 (file)
--- a/drivers/dma/ti/k3-udma.c
+++ b/drivers/dma/ti/k3-udma.c
@@ -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,26 +599,24 @@ 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;
+       ret = k3_ringacc_ring_pop(ring, addr);
+       if (ret)
+               return ret;
 
-               rmb(); /* Ensure that reads are not moved before this point */
+       rmb(); /* Ensure that reads are not moved before this point */
 
-               /* Teardown completion */
-               if (cppi5_desc_is_tdcm(*addr))
-                       return ret;
+       /* Teardown completion */
+       if (cppi5_desc_is_tdcm(*addr))
+               return 0;
 
-               /* Check for flush descriptor */
-               if (udma_desc_is_rx_flush(uc, *addr))
-                       return -ENOENT;
-       }
+       /* 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)