From: Nicholas Graumann <[email protected]> Now that we track residues for each descriptor, there is no need to keep track of the residue for each channel.
Signed-off-by: Nicholas Graumann <[email protected]> Signed-off-by: Radhey Shyam Pandey <[email protected]> --- drivers/dma/xilinx/xilinx_dma.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/dma/xilinx/xilinx_dma.c b/drivers/dma/xilinx/xilinx_dma.c index 3f2e0ad..bf3fa2e 100644 --- a/drivers/dma/xilinx/xilinx_dma.c +++ b/drivers/dma/xilinx/xilinx_dma.c @@ -340,7 +340,6 @@ struct xilinx_dma_tx_descriptor { * @desc_pendingcount: Descriptor pending count * @ext_addr: Indicates 64 bit addressing is supported by dma channel * @desc_submitcount: Descriptor h/w submitted count - * @residue: Residue for AXI DMA * @seg_v: Statically allocated segments base * @seg_p: Physical allocated segments base * @cyclic_seg_v: Statically allocated segment base for cyclic transfers @@ -377,7 +376,6 @@ struct xilinx_dma_chan { u32 desc_pendingcount; bool ext_addr; u32 desc_submitcount; - u32 residue; struct xilinx_axidma_tx_segment *seg_v; dma_addr_t seg_p; struct xilinx_axidma_tx_segment *cyclic_seg_v; @@ -1068,11 +1066,11 @@ static enum dma_status xilinx_dma_tx_status(struct dma_chan *dchan, desc = list_last_entry(&chan->active_list, struct xilinx_dma_tx_descriptor, node); - chan->residue = xilinx_dma_get_residue(chan, desc); + desc->residue = xilinx_dma_get_residue(chan, desc); spin_unlock_irqrestore(&chan->lock, flags); - dma_set_residue(txstate, chan->residue); + dma_set_residue(txstate, desc->residue); return ret; } -- 2.7.4
