aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/dma
diff options
context:
space:
mode:
authorPeter Ujfalusi <peter.ujfalusi@ti.com>2015-11-11 05:37:56 -0500
committerVinod Koul <vinod.koul@intel.com>2015-12-05 03:06:38 -0500
commite8a5e79c17f977d1820ffe9b6ac259c953b3b34b (patch)
tree8a67cf10b39e50a3ece8e0b0d5a15c3e0bb0249f /drivers/dma
parentadf850bcca4eec45f06c6ad3e297a350a8a319bc (diff)
dmaengine: omap-dma: Clean up the prep_slave_sg sg list walk code
The for_each_sg() macro's last parameter is inteded to be used as counter. We can use 'i' instead of 'j' within the loop for indexes. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'drivers/dma')
-rw-r--r--drivers/dma/omap-dma.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/dma/omap-dma.c b/drivers/dma/omap-dma.c
index 8ed39ce24d46..4afc2c18d451 100644
--- a/drivers/dma/omap-dma.c
+++ b/drivers/dma/omap-dma.c
@@ -768,7 +768,7 @@ static struct dma_async_tx_descriptor *omap_dma_prep_slave_sg(
768 struct scatterlist *sgent; 768 struct scatterlist *sgent;
769 struct omap_desc *d; 769 struct omap_desc *d;
770 dma_addr_t dev_addr; 770 dma_addr_t dev_addr;
771 unsigned i, j = 0, es, en, frame_bytes; 771 unsigned i, es, en, frame_bytes;
772 u32 burst; 772 u32 burst;
773 773
774 if (dir == DMA_DEV_TO_MEM) { 774 if (dir == DMA_DEV_TO_MEM) {
@@ -845,13 +845,12 @@ static struct dma_async_tx_descriptor *omap_dma_prep_slave_sg(
845 en = burst; 845 en = burst;
846 frame_bytes = es_bytes[es] * en; 846 frame_bytes = es_bytes[es] * en;
847 for_each_sg(sgl, sgent, sglen, i) { 847 for_each_sg(sgl, sgent, sglen, i) {
848 d->sg[j].addr = sg_dma_address(sgent); 848 d->sg[i].addr = sg_dma_address(sgent);
849 d->sg[j].en = en; 849 d->sg[i].en = en;
850 d->sg[j].fn = sg_dma_len(sgent) / frame_bytes; 850 d->sg[i].fn = sg_dma_len(sgent) / frame_bytes;
851 j++;
852 } 851 }
853 852
854 d->sglen = j; 853 d->sglen = sglen;
855 854
856 return vchan_tx_prep(&c->vc, &d->vd, tx_flags); 855 return vchan_tx_prep(&c->vc, &d->vd, tx_flags);
857} 856}