| Message ID | 20161021173535.100245-2-andriy.shevchenko@linux.intel.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Headers | show |
On Fri, Oct 21, 2016 at 08:35:27PM +0300, Andy Shevchenko wrote: > Instead of open coded variant let's use recently introduced helper. > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > --- > drivers/dma/bcm2835-dma.c | 19 +------------------ > 1 file changed, 1 insertion(+), 18 deletions(-) > > diff --git a/drivers/dma/bcm2835-dma.c b/drivers/dma/bcm2835-dma.c > index e18dc59..0ca899e 100644 > --- a/drivers/dma/bcm2835-dma.c > +++ b/drivers/dma/bcm2835-dma.c > @@ -264,23 +264,6 @@ static void bcm2835_dma_create_cb_set_length( > control_block->info |= finalextrainfo; > } > > -static inline size_t bcm2835_dma_count_frames_for_sg( > - struct bcm2835_chan *c, > - struct scatterlist *sgl, > - unsigned int sg_len) > -{ > - size_t frames = 0; > - struct scatterlist *sgent; > - unsigned int i; > - size_t plength = bcm2835_dma_max_frame_length(c); > - > - for_each_sg(sgl, sgent, sg_len, i) > - frames += bcm2835_dma_frames_for_length( > - sg_dma_len(sgent), plength); > - > - return frames; > -} > - > /** > * bcm2835_dma_create_cb_chain - create a control block and fills data in > * > @@ -677,7 +660,7 @@ static struct dma_async_tx_descriptor *bcm2835_dma_prep_slave_sg( > } > > /* count frames in sg list */ > - frames = bcm2835_dma_count_frames_for_sg(c, sgl, sg_len); > + frames = sg_nents_for_dma(sgl, sg_len, bcm2835_dma_max_frame_length(c)); is frames same as nents? seems not right..
diff --git a/drivers/dma/bcm2835-dma.c b/drivers/dma/bcm2835-dma.c index e18dc59..0ca899e 100644 --- a/drivers/dma/bcm2835-dma.c +++ b/drivers/dma/bcm2835-dma.c @@ -264,23 +264,6 @@ static void bcm2835_dma_create_cb_set_length( control_block->info |= finalextrainfo; } -static inline size_t bcm2835_dma_count_frames_for_sg( - struct bcm2835_chan *c, - struct scatterlist *sgl, - unsigned int sg_len) -{ - size_t frames = 0; - struct scatterlist *sgent; - unsigned int i; - size_t plength = bcm2835_dma_max_frame_length(c); - - for_each_sg(sgl, sgent, sg_len, i) - frames += bcm2835_dma_frames_for_length( - sg_dma_len(sgent), plength); - - return frames; -} - /** * bcm2835_dma_create_cb_chain - create a control block and fills data in * @@ -677,7 +660,7 @@ static struct dma_async_tx_descriptor *bcm2835_dma_prep_slave_sg( } /* count frames in sg list */ - frames = bcm2835_dma_count_frames_for_sg(c, sgl, sg_len); + frames = sg_nents_for_dma(sgl, sg_len, bcm2835_dma_max_frame_length(c)); /* allocate the CB chain */ d = bcm2835_dma_create_cb_chain(chan, direction, false,
Instead of open coded variant let's use recently introduced helper. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- drivers/dma/bcm2835-dma.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-)