Commit 6fea8735 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Vinod Koul

dmaengine: ti: k3-udma: Remove udma_chan.in_ring_cnt

The in_ring_cnt is not used for anything, it can be removed.
Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Link: https://lore.kernel.org/r/20200512134611.6015-1-peter.ujfalusi@ti.comSigned-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent 5bbeea34
...@@ -231,7 +231,6 @@ struct udma_chan { ...@@ -231,7 +231,6 @@ struct udma_chan {
struct udma_tx_drain tx_drain; struct udma_tx_drain tx_drain;
u32 bcnt; /* number of bytes completed since the start of the channel */ u32 bcnt; /* number of bytes completed since the start of the channel */
u32 in_ring_cnt; /* number of descriptors in flight */
/* Channel configuration parameters */ /* Channel configuration parameters */
struct udma_chan_config config; struct udma_chan_config config;
...@@ -574,7 +573,6 @@ static int udma_push_to_ring(struct udma_chan *uc, int idx) ...@@ -574,7 +573,6 @@ static int udma_push_to_ring(struct udma_chan *uc, int idx)
struct udma_desc *d = uc->desc; struct udma_desc *d = uc->desc;
struct k3_ring *ring = NULL; struct k3_ring *ring = NULL;
dma_addr_t paddr; dma_addr_t paddr;
int ret;
switch (uc->config.dir) { switch (uc->config.dir) {
case DMA_DEV_TO_MEM: case DMA_DEV_TO_MEM:
...@@ -598,11 +596,7 @@ static int udma_push_to_ring(struct udma_chan *uc, int idx) ...@@ -598,11 +596,7 @@ static int udma_push_to_ring(struct udma_chan *uc, int idx)
udma_sync_for_device(uc, idx); udma_sync_for_device(uc, idx);
} }
ret = k3_ringacc_ring_push(ring, &paddr); return k3_ringacc_ring_push(ring, &paddr);
if (!ret)
uc->in_ring_cnt++;
return ret;
} }
static bool udma_desc_is_rx_flush(struct udma_chan *uc, dma_addr_t addr) static bool udma_desc_is_rx_flush(struct udma_chan *uc, dma_addr_t addr)
...@@ -655,9 +649,6 @@ static int udma_pop_from_ring(struct udma_chan *uc, dma_addr_t *addr) ...@@ -655,9 +649,6 @@ static int udma_pop_from_ring(struct udma_chan *uc, dma_addr_t *addr)
d->hwdesc[0].cppi5_desc_size, d->hwdesc[0].cppi5_desc_size,
DMA_FROM_DEVICE); DMA_FROM_DEVICE);
rmb(); /* Ensure that reads are not moved before this point */ rmb(); /* Ensure that reads are not moved before this point */
if (!ret)
uc->in_ring_cnt--;
} }
return ret; return ret;
...@@ -697,8 +688,6 @@ static void udma_reset_rings(struct udma_chan *uc) ...@@ -697,8 +688,6 @@ static void udma_reset_rings(struct udma_chan *uc)
udma_desc_free(&uc->terminated_desc->vd); udma_desc_free(&uc->terminated_desc->vd);
uc->terminated_desc = NULL; uc->terminated_desc = NULL;
} }
uc->in_ring_cnt = 0;
} }
static void udma_reset_counters(struct udma_chan *uc) static void udma_reset_counters(struct udma_chan *uc)
...@@ -1073,9 +1062,6 @@ static irqreturn_t udma_ring_irq_handler(int irq, void *data) ...@@ -1073,9 +1062,6 @@ static irqreturn_t udma_ring_irq_handler(int irq, void *data)
/* Teardown completion message */ /* Teardown completion message */
if (cppi5_desc_is_tdcm(paddr)) { if (cppi5_desc_is_tdcm(paddr)) {
/* Compensate our internal pop/push counter */
uc->in_ring_cnt++;
complete_all(&uc->teardown_completed); complete_all(&uc->teardown_completed);
if (uc->terminated_desc) { if (uc->terminated_desc) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment